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 |
|---|---|---|---|---|
assert.Nil(t, s.AddStaticLease(l)) | <mask> // add static lease with the same MAC
<mask> l = Lease{}
<mask> l.IP = net.ParseIP("2001::3")
<mask> l.HWAddr, _ = net.ParseMAC("22:aa:aa:aa:aa:aa")
<mask> assert.True(t, s.AddStaticLease(l) == nil)
<mask>
<mask> // check
<mask> ls := s.GetLeases(LeasesStatic)
<mask> assert.Equal(t, 2, len(ls))
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove l.IP = net.ParseIP("192.168.10.152").To4()
</s> add l.IP = net.IP{192, 168, 10, 152} </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove l.IP = net.ParseIP("192.168.10.150").To4()
</s> add l.IP = net.IP{192, 168, 10, 150} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v6_test.go |
assert.Len(t, ls, 2) | <mask> assert.True(t, s.AddStaticLease(l) == nil)
<mask>
<mask> // check
<mask> ls := s.GetLeases(LeasesStatic)
<mask> assert.Equal(t, 2, len(ls))
<mask>
<mask> assert.Equal(t, "2001::1", ls[0].IP.String())
<mask> assert.Equal(t, "33:aa:aa:aa:aa:aa", ls[0].HWAddr.String())
<mask> assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 2, len(ls))
</s> add assert.Len(t, ls, 2) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix()) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v6_test.go |
assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix()) | <mask> assert.Equal(t, 2, len(ls))
<mask>
<mask> assert.Equal(t, "2001::1", ls[0].IP.String())
<mask> assert.Equal(t, "33:aa:aa:aa:aa:aa", ls[0].HWAddr.String())
<mask> assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
<mask>
<mask> assert.Equal(t, "2001::3", ls[1].IP.String())
<mask> assert.Equal(t, "22:aa:aa:aa:aa:aa", ls[1].HWAddr.String())
<mask> assert.True(t, ls[1].Expiry.Unix() == leaseExpireStatic)
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix()) </s> remove assert.True(t, ls[1].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[1].Expiry.Unix()) </s> remove assert.True(t, ls[1].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[1].Expiry.Unix()) </s> remove assert.Equal(t, 2, len(ls))
</s> add assert.Len(t, ls, 2) </s> remove assert.Equal(t, 2, len(ls))
</s> add assert.Len(t, ls, 2) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v6_test.go |
assert.EqualValues(t, leaseExpireStatic, ls[1].Expiry.Unix()) | <mask> assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
<mask>
<mask> assert.Equal(t, "2001::3", ls[1].IP.String())
<mask> assert.Equal(t, "22:aa:aa:aa:aa:aa", ls[1].HWAddr.String())
<mask> assert.True(t, ls[1].Expiry.Unix() == leaseExpireStatic)
<mask> }
<mask>
<mask> func TestV6GetLease(t *testing.T) {
<mask> conf := V6ServerConf{
<mask> Enabled: true,
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, ls[1].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[1].Expiry.Unix()) </s> remove assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix()) </s> remove assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix()) </s> remove assert.Equal(t, 0, len(ls))
</s> add assert.Empty(t, ls) </s> remove assert.Equal(t, 0, len(ls))
</s> add assert.Empty(t, ls) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v6_test.go |
assert.Nil(t, err) | <mask> notify: notify6,
<mask> }
<mask> sIface, err := v6Create(conf)
<mask> s := sIface.(*v6Server)
<mask> assert.True(t, err == nil)
<mask> s.conf.dnsIPAddrs = []net.IP{net.ParseIP("2000::1")}
<mask> s.sid = dhcpv6.Duid{
<mask> Type: dhcpv6.DUID_LLT,
<mask> HwType: iana.HWTypeEthernet,
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil)
s.conf.dnsIPAddrs = []net.IP{net.ParseIP("192.168.10.1").To4()}
</s> add assert.Nil(t, err)
s.conf.dnsIPAddrs = []net.IP{{192, 168, 10, 1}} </s> remove assert.True(t, err == nil)
s.conf.dnsIPAddrs = []net.IP{net.ParseIP("192.168.10.1").To4()}
</s> add assert.Nil(t, err)
s.conf.dnsIPAddrs = []net.IP{{192, 168, 10, 1}} </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v6_test.go |
assert.Nil(t, s.AddStaticLease(l)) | <mask>
<mask> l := Lease{}
<mask> l.IP = net.ParseIP("2001::1")
<mask> l.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:aa")
<mask> assert.True(t, s.AddStaticLease(l) == nil)
<mask>
<mask> // "Solicit"
<mask> mac, _ := net.ParseMAC("aa:aa:aa:aa:aa:aa")
<mask> req, _ := dhcpv6.NewSolicit(mac)
<mask> msg, _ := req.GetInnerMessage()
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove l.IP = net.ParseIP("192.168.10.150").To4()
</s> add l.IP = net.IP{192, 168, 10, 150} </s> remove assert.Equal(t, 0, len(ls))
</s> add assert.Empty(t, ls) </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove assert.True(t, err == nil)
s.conf.dnsIPAddrs = []net.IP{net.ParseIP("192.168.10.1").To4()}
</s> add assert.Nil(t, err)
s.conf.dnsIPAddrs = []net.IP{{192, 168, 10, 1}} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v6_test.go |
assert.Len(t, dnsAddrs, 1) | <mask> assert.Equal(t, "2001::1", oiaAddr.IPv6Addr.String())
<mask> assert.Equal(t, s.conf.leaseTime.Seconds(), oiaAddr.ValidLifetime.Seconds())
<mask>
<mask> dnsAddrs := resp.Options.DNS()
<mask> assert.Equal(t, 1, len(dnsAddrs))
<mask> assert.Equal(t, "2000::1", dnsAddrs[0].String())
<mask>
<mask> // check lease
<mask> ls := s.GetLeases(LeasesStatic)
<mask> assert.Equal(t, 1, len(ls))
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 1, len(dnsAddrs))
</s> add assert.Len(t, dnsAddrs, 1) </s> remove assert.Equal(t, 1, len(dnsAddrs))
</s> add assert.Len(t, dnsAddrs, 1) </s> remove assert.Equal(t, 1, len(dnsAddrs))
</s> add assert.Len(t, dnsAddrs, 1) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v6_test.go |
assert.Len(t, ls, 1) | <mask> assert.Equal(t, "2000::1", dnsAddrs[0].String())
<mask>
<mask> // check lease
<mask> ls := s.GetLeases(LeasesStatic)
<mask> assert.Equal(t, 1, len(ls))
<mask> assert.Equal(t, "2001::1", ls[0].IP.String())
<mask> assert.Equal(t, "aa:aa:aa:aa:aa:aa", ls[0].HWAddr.String())
<mask> }
<mask>
<mask> func TestV6GetDynamicLease(t *testing.T) {
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove assert.Equal(t, 1, len(dnsAddrs))
</s> add assert.Len(t, dnsAddrs, 1) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v6_test.go |
assert.Nil(t, err) | <mask> notify: notify6,
<mask> }
<mask> sIface, err := v6Create(conf)
<mask> s := sIface.(*v6Server)
<mask> assert.True(t, err == nil)
<mask> s.conf.dnsIPAddrs = []net.IP{net.ParseIP("2000::1")}
<mask> s.sid = dhcpv6.Duid{
<mask> Type: dhcpv6.DUID_LLT,
<mask> HwType: iana.HWTypeEthernet,
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v6_test.go |
assert.Len(t, dnsAddrs, 1) | <mask> oiaAddr = oia.Options.OneAddress()
<mask> assert.Equal(t, "2001::2", oiaAddr.IPv6Addr.String())
<mask>
<mask> dnsAddrs := resp.Options.DNS()
<mask> assert.Equal(t, 1, len(dnsAddrs))
<mask> assert.Equal(t, "2000::1", dnsAddrs[0].String())
<mask>
<mask> // check lease
<mask> ls := s.GetLeases(LeasesDynamic)
<mask> assert.Equal(t, 1, len(ls))
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 1, len(dnsAddrs))
</s> add assert.Len(t, dnsAddrs, 1) </s> remove assert.Equal(t, 1, len(dnsAddrs))
</s> add assert.Len(t, dnsAddrs, 1) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove assert.Equal(t, 1, len(dnsAddrs))
</s> add assert.Len(t, dnsAddrs, 1) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v6_test.go |
assert.Len(t, ls, 1) | <mask> assert.Equal(t, "2000::1", dnsAddrs[0].String())
<mask>
<mask> // check lease
<mask> ls := s.GetLeases(LeasesDynamic)
<mask> assert.Equal(t, 1, len(ls))
<mask> assert.Equal(t, "2001::2", ls[0].IP.String())
<mask> assert.Equal(t, "aa:aa:aa:aa:aa:aa", ls[0].HWAddr.String())
<mask>
<mask> assert.True(t, !ip6InRange(net.ParseIP("2001::2"), net.ParseIP("2001::1")))
<mask> assert.True(t, !ip6InRange(net.ParseIP("2001::2"), net.ParseIP("2002::2")))
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, !ip6InRange(net.ParseIP("2001::2"), net.ParseIP("2001::1")))
assert.True(t, !ip6InRange(net.ParseIP("2001::2"), net.ParseIP("2002::2")))
</s> add assert.False(t, ip6InRange(net.ParseIP("2001::2"), net.ParseIP("2001::1")))
assert.False(t, ip6InRange(net.ParseIP("2001::2"), net.ParseIP("2002::2"))) </s> remove assert.Equal(t, 1, len(dnsAddrs))
</s> add assert.Len(t, dnsAddrs, 1) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v6_test.go |
assert.False(t, ip6InRange(net.ParseIP("2001::2"), net.ParseIP("2001::1")))
assert.False(t, ip6InRange(net.ParseIP("2001::2"), net.ParseIP("2002::2"))) | <mask> assert.Equal(t, 1, len(ls))
<mask> assert.Equal(t, "2001::2", ls[0].IP.String())
<mask> assert.Equal(t, "aa:aa:aa:aa:aa:aa", ls[0].HWAddr.String())
<mask>
<mask> assert.True(t, !ip6InRange(net.ParseIP("2001::2"), net.ParseIP("2001::1")))
<mask> assert.True(t, !ip6InRange(net.ParseIP("2001::2"), net.ParseIP("2002::2")))
<mask> assert.True(t, ip6InRange(net.ParseIP("2001::2"), net.ParseIP("2001::2")))
<mask> assert.True(t, ip6InRange(net.ParseIP("2001::2"), net.ParseIP("2001::3")))
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove assert.Equal(t, 1, len(ls))
</s> add assert.Len(t, ls, 1) </s> remove assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix()) </s> remove assert.True(t, ls[0].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dhcpd/v6_test.go |
<mask> import (
<mask> "bytes"
<mask> "fmt"
<mask> "net"
<mask> "strings"
<mask> "testing"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/testutil"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/urlfilter/rules"
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, ls[1].Expiry.Unix() == leaseExpireStatic)
</s> add assert.EqualValues(t, leaseExpireStatic, ls[1].Expiry.Unix()) </s> remove assert.True(t, s.RemoveStaticLease(l) == nil)
</s> add assert.Nil(t, s.RemoveStaticLease(l)) </s> remove assert.Equal(t, 0, len(ls))
</s> add assert.Empty(t, ls) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/dnsfilter_test.go | |
assert.Empty(t, res.Rules[0].IP) | <mask> assert.Nil(t, err)
<mask> assert.True(t, res.IsFiltered)
<mask> if assert.Len(t, res.Rules, 1) {
<mask> assert.Equal(t, "0.0.0.0 block.com", res.Rules[0].Text)
<mask> assert.Len(t, res.Rules[0].IP, 0)
<mask> }
<mask>
<mask> // IPv6
<mask> d.checkMatchIP(t, "ipv6.com", addr6, dns.TypeAAAA)
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Len(t, res.Rules[0].IP, 0)
</s> add assert.Empty(t, res.Rules[0].IP) </s> remove assert.True(t, res.Rules[0].Text == "||host2^")
</s> add assert.Equal(t, "||host2^", res.Rules[0].Text) </s> remove assert.True(t, err == nil)
assert.True(t, res.IsFiltered && res.Reason == FilteredBlockList)
</s> add assert.Nil(t, err)
assert.True(t, res.IsFiltered)
assert.Equal(t, res.Reason, FilteredBlockList) </s> remove assert.Len(t, res.Rules, 0)
</s> add assert.Empty(t, res.Rules) </s> remove assert.True(t, err == nil)
assert.True(t, !res.IsFiltered && res.Reason == NotFilteredAllowList)
</s> add assert.Nil(t, err)
assert.False(t, res.IsFiltered)
assert.Equal(t, res.Reason, NotFilteredAllowList) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/dnsfilter_test.go |
assert.Empty(t, res.Rules[0].IP) | <mask> assert.Nil(t, err)
<mask> assert.True(t, res.IsFiltered)
<mask> if assert.Len(t, res.Rules, 1) {
<mask> assert.Equal(t, "::1 ipv6.com", res.Rules[0].Text)
<mask> assert.Len(t, res.Rules[0].IP, 0)
<mask> }
<mask>
<mask> // 2 IPv4 (return only the first one)
<mask> res, err = d.CheckHost("host2", dns.TypeA, &setts)
<mask> assert.Nil(t, err)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Len(t, res.Rules[0].IP, 0)
</s> add assert.Empty(t, res.Rules[0].IP) </s> remove assert.True(t, res.Rules[0].Text == "||host2^")
</s> add assert.Equal(t, "||host2^", res.Rules[0].Text) </s> remove assert.Len(t, res.Rules, 0)
</s> add assert.Empty(t, res.Rules) </s> remove assert.True(t, err == nil)
assert.True(t, res.IsFiltered && res.Reason == FilteredBlockList)
</s> add assert.Nil(t, err)
assert.True(t, res.IsFiltered)
assert.Equal(t, res.Reason, FilteredBlockList) </s> remove assert.True(t, res.Rules[0].Text == "||host1^")
</s> add assert.Equal(t, "||host1^", res.Rules[0].Text) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/dnsfilter_test.go |
assert.Contains(t, logOutput.String(), "SafeBrowsing lookup for wmconvirus.narod.ru") | <mask> d := NewForTest(&Config{SafeBrowsingEnabled: true}, nil)
<mask> defer d.Close()
<mask> d.checkMatch(t, "wmconvirus.narod.ru")
<mask>
<mask> assert.True(t, strings.Contains(logOutput.String(), "SafeBrowsing lookup for wmconvirus.narod.ru"))
<mask>
<mask> d.checkMatch(t, "test.wmconvirus.narod.ru")
<mask> d.checkMatchEmpty(t, "yandex.ru")
<mask> d.checkMatchEmpty(t, "pornhub.com")
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, strings.Contains(logOutput.String(), "Parental lookup for pornhub.com"))
</s> add assert.Contains(t, logOutput.String(), "Parental lookup for pornhub.com") </s> remove assert.Len(t, res.Rules, 0)
</s> add assert.Empty(t, res.Rules) </s> remove assert.Len(t, res.Rules, 0)
</s> add assert.Empty(t, res.Rules) </s> remove assert.True(t, err == nil)
assert.True(t, !res.IsFiltered && res.Reason == NotFilteredAllowList)
</s> add assert.Nil(t, err)
assert.False(t, res.IsFiltered)
assert.Equal(t, res.Reason, NotFilteredAllowList) </s> remove assert.True(t, d["num_dns_queries"].(uint64) == uint64(int(hour)*n))
</s> add assert.EqualValues(t, int(hour)*n, d["num_dns_queries"]) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/dnsfilter_test.go |
assert.Empty(t, res.Rules) | <mask> // Check host with disabled safesearch.
<mask> res, err := d.CheckHost(domain, dns.TypeA, &setts)
<mask> assert.Nil(t, err)
<mask> assert.False(t, res.IsFiltered)
<mask> assert.Len(t, res.Rules, 0)
<mask>
<mask> d = NewForTest(&Config{SafeSearchEnabled: true}, nil)
<mask> defer d.Close()
<mask>
<mask> res, err = d.CheckHost(domain, dns.TypeA, &setts)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Len(t, res.Rules, 0)
</s> add assert.Empty(t, res.Rules) </s> remove assert.Len(t, res.Rules[0].IP, 0)
</s> add assert.Empty(t, res.Rules[0].IP) </s> remove assert.True(t, err == nil)
assert.True(t, !res.IsFiltered && res.Reason == NotFilteredAllowList)
</s> add assert.Nil(t, err)
assert.False(t, res.IsFiltered)
assert.Equal(t, res.Reason, NotFilteredAllowList) </s> remove assert.True(t, res.Rules[0].Text == "||host1^")
</s> add assert.Equal(t, "||host1^", res.Rules[0].Text) </s> remove assert.True(t, err == nil)
assert.True(t, res.IsFiltered && res.Reason == FilteredBlockList)
</s> add assert.Nil(t, err)
assert.True(t, res.IsFiltered)
assert.Equal(t, res.Reason, FilteredBlockList) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/dnsfilter_test.go |
assert.Empty(t, res.Rules) | <mask> domain := "www.google.ru"
<mask> res, err := d.CheckHost(domain, dns.TypeA, &setts)
<mask> assert.Nil(t, err)
<mask> assert.False(t, res.IsFiltered)
<mask> assert.Len(t, res.Rules, 0)
<mask>
<mask> d = NewForTest(&Config{SafeSearchEnabled: true}, nil)
<mask> defer d.Close()
<mask>
<mask> // Let's lookup for safesearch domain
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Len(t, res.Rules, 0)
</s> add assert.Empty(t, res.Rules) </s> remove assert.True(t, strings.Contains(logOutput.String(), "SafeBrowsing lookup for wmconvirus.narod.ru"))
</s> add assert.Contains(t, logOutput.String(), "SafeBrowsing lookup for wmconvirus.narod.ru") </s> remove assert.True(t, strings.Contains(logOutput.String(), "Parental lookup for pornhub.com"))
</s> add assert.Contains(t, logOutput.String(), "Parental lookup for pornhub.com") </s> remove assert.True(t, err == nil)
assert.True(t, !res.IsFiltered && res.Reason == NotFilteredAllowList)
</s> add assert.Nil(t, err)
assert.False(t, res.IsFiltered)
assert.Equal(t, res.Reason, NotFilteredAllowList) </s> remove assert.Len(t, res.Rules[0].IP, 0)
</s> add assert.Empty(t, res.Rules[0].IP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/dnsfilter_test.go |
assert.Contains(t, logOutput.String(), "Parental lookup for pornhub.com") | <mask>
<mask> d := NewForTest(&Config{ParentalEnabled: true}, nil)
<mask> defer d.Close()
<mask> d.checkMatch(t, "pornhub.com")
<mask> assert.True(t, strings.Contains(logOutput.String(), "Parental lookup for pornhub.com"))
<mask> d.checkMatch(t, "www.pornhub.com")
<mask> d.checkMatchEmpty(t, "www.yandex.ru")
<mask> d.checkMatchEmpty(t, "yandex.ru")
<mask> d.checkMatchEmpty(t, "api.jquery.com")
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, strings.Contains(logOutput.String(), "SafeBrowsing lookup for wmconvirus.narod.ru"))
</s> add assert.Contains(t, logOutput.String(), "SafeBrowsing lookup for wmconvirus.narod.ru") </s> remove assert.Len(t, res.Rules, 0)
</s> add assert.Empty(t, res.Rules) </s> remove assert.Len(t, res.Rules, 0)
</s> add assert.Empty(t, res.Rules) </s> remove assert.True(t, err == nil)
assert.True(t, !res.IsFiltered && res.Reason == NotFilteredAllowList)
</s> add assert.Nil(t, err)
assert.False(t, res.IsFiltered)
assert.Equal(t, res.Reason, NotFilteredAllowList) </s> remove assert.True(t, d["num_dns_queries"].(uint64) == uint64(int(hour)*n))
</s> add assert.EqualValues(t, int(hour)*n, d["num_dns_queries"]) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/dnsfilter_test.go |
assert.Nil(t, err)
assert.False(t, res.IsFiltered)
assert.Equal(t, res.Reason, NotFilteredAllowList) | <mask> defer d.Close()
<mask>
<mask> // matched by white filter
<mask> res, err := d.CheckHost("host1", dns.TypeA, &setts)
<mask> assert.True(t, err == nil)
<mask> assert.True(t, !res.IsFiltered && res.Reason == NotFilteredAllowList)
<mask> if assert.Len(t, res.Rules, 1) {
<mask> assert.True(t, res.Rules[0].Text == "||host1^")
<mask> }
<mask>
<mask> // not matched by white filter, but matched by block filter
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, res.Rules[0].Text == "||host1^")
</s> add assert.Equal(t, "||host1^", res.Rules[0].Text) </s> remove assert.True(t, err == nil)
assert.True(t, res.IsFiltered && res.Reason == FilteredBlockList)
</s> add assert.Nil(t, err)
assert.True(t, res.IsFiltered)
assert.Equal(t, res.Reason, FilteredBlockList) </s> remove assert.True(t, res.Rules[0].Text == "||host2^")
</s> add assert.Equal(t, "||host2^", res.Rules[0].Text) </s> remove assert.Len(t, res.Rules, 0)
</s> add assert.Empty(t, res.Rules) </s> remove assert.Len(t, res.Rules, 0)
</s> add assert.Empty(t, res.Rules) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/dnsfilter_test.go |
assert.Equal(t, "||host1^", res.Rules[0].Text) | <mask> res, err := d.CheckHost("host1", dns.TypeA, &setts)
<mask> assert.True(t, err == nil)
<mask> assert.True(t, !res.IsFiltered && res.Reason == NotFilteredAllowList)
<mask> if assert.Len(t, res.Rules, 1) {
<mask> assert.True(t, res.Rules[0].Text == "||host1^")
<mask> }
<mask>
<mask> // not matched by white filter, but matched by block filter
<mask> res, err = d.CheckHost("host2", dns.TypeA, &setts)
<mask> assert.True(t, err == nil)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, err == nil)
assert.True(t, !res.IsFiltered && res.Reason == NotFilteredAllowList)
</s> add assert.Nil(t, err)
assert.False(t, res.IsFiltered)
assert.Equal(t, res.Reason, NotFilteredAllowList) </s> remove assert.True(t, err == nil)
assert.True(t, res.IsFiltered && res.Reason == FilteredBlockList)
</s> add assert.Nil(t, err)
assert.True(t, res.IsFiltered)
assert.Equal(t, res.Reason, FilteredBlockList) </s> remove assert.True(t, res.Rules[0].Text == "||host2^")
</s> add assert.Equal(t, "||host2^", res.Rules[0].Text) </s> remove assert.Len(t, res.Rules[0].IP, 0)
</s> add assert.Empty(t, res.Rules[0].IP) </s> remove assert.Len(t, res.Rules, 0)
</s> add assert.Empty(t, res.Rules) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/dnsfilter_test.go |
assert.Nil(t, err)
assert.True(t, res.IsFiltered)
assert.Equal(t, res.Reason, FilteredBlockList) | <mask> }
<mask>
<mask> // not matched by white filter, but matched by block filter
<mask> res, err = d.CheckHost("host2", dns.TypeA, &setts)
<mask> assert.True(t, err == nil)
<mask> assert.True(t, res.IsFiltered && res.Reason == FilteredBlockList)
<mask> if assert.Len(t, res.Rules, 1) {
<mask> assert.True(t, res.Rules[0].Text == "||host2^")
<mask> }
<mask> }
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, res.Rules[0].Text == "||host1^")
</s> add assert.Equal(t, "||host1^", res.Rules[0].Text) </s> remove assert.True(t, err == nil)
assert.True(t, !res.IsFiltered && res.Reason == NotFilteredAllowList)
</s> add assert.Nil(t, err)
assert.False(t, res.IsFiltered)
assert.Equal(t, res.Reason, NotFilteredAllowList) </s> remove assert.True(t, res.Rules[0].Text == "||host2^")
</s> add assert.Equal(t, "||host2^", res.Rules[0].Text) </s> remove assert.Len(t, res.Rules[0].IP, 0)
</s> add assert.Empty(t, res.Rules[0].IP) </s> remove assert.True(t, r.IsFiltered && r.Reason == FilteredBlockedService)
</s> add assert.True(t, r.IsFiltered)
assert.Equal(t, r.Reason, FilteredBlockedService) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/dnsfilter_test.go |
assert.Equal(t, "||host2^", res.Rules[0].Text) | <mask> res, err = d.CheckHost("host2", dns.TypeA, &setts)
<mask> assert.True(t, err == nil)
<mask> assert.True(t, res.IsFiltered && res.Reason == FilteredBlockList)
<mask> if assert.Len(t, res.Rules, 1) {
<mask> assert.True(t, res.Rules[0].Text == "||host2^")
<mask> }
<mask> }
<mask>
<mask> // CLIENT SETTINGS
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, err == nil)
assert.True(t, res.IsFiltered && res.Reason == FilteredBlockList)
</s> add assert.Nil(t, err)
assert.True(t, res.IsFiltered)
assert.Equal(t, res.Reason, FilteredBlockList) </s> remove assert.True(t, res.Rules[0].Text == "||host1^")
</s> add assert.Equal(t, "||host1^", res.Rules[0].Text) </s> remove assert.True(t, err == nil)
assert.True(t, !res.IsFiltered && res.Reason == NotFilteredAllowList)
</s> add assert.Nil(t, err)
assert.False(t, res.IsFiltered)
assert.Equal(t, res.Reason, NotFilteredAllowList) </s> remove assert.Len(t, res.Rules[0].IP, 0)
</s> add assert.Empty(t, res.Rules[0].IP) </s> remove assert.Len(t, res.Rules, 0)
</s> add assert.Empty(t, res.Rules) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/dnsfilter_test.go |
assert.False(t, r.IsFiltered) | <mask> }
<mask>
<mask> // not blocked
<mask> r, _ = d.CheckHost("facebook.com", dns.TypeA, &setts)
<mask> assert.True(t, !r.IsFiltered)
<mask>
<mask> // override client settings:
<mask> applyClientSettings(&setts)
<mask>
<mask> // override filtering settings
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, r.IsFiltered && r.Reason == FilteredBlockedService)
</s> add assert.True(t, r.IsFiltered)
assert.Equal(t, r.Reason, FilteredBlockedService) </s> remove assert.True(t, res.Rules[0].Text == "||host1^")
</s> add assert.Equal(t, "||host1^", res.Rules[0].Text) </s> remove assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.5")))
</s> add assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 5})) </s> remove assert.True(t, err == nil)
assert.True(t, res.IsFiltered && res.Reason == FilteredBlockList)
</s> add assert.Nil(t, err)
assert.True(t, res.IsFiltered)
assert.Equal(t, res.Reason, FilteredBlockList) </s> remove assert.True(t, res.Rules[0].Text == "||host2^")
</s> add assert.Equal(t, "||host2^", res.Rules[0].Text) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/dnsfilter_test.go |
assert.True(t, r.IsFiltered)
assert.Equal(t, r.Reason, FilteredBlockedService) | <mask> }
<mask>
<mask> // blocked by additional rules
<mask> r, _ = d.CheckHost("facebook.com", dns.TypeA, &setts)
<mask> assert.True(t, r.IsFiltered && r.Reason == FilteredBlockedService)
<mask> }
<mask>
<mask> // BENCHMARKS
<mask>
<mask> func BenchmarkSafeBrowsing(b *testing.B) {
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, !r.IsFiltered)
</s> add assert.False(t, r.IsFiltered) </s> remove assert.True(t, res.Rules[0].Text == "||host1^")
</s> add assert.Equal(t, "||host1^", res.Rules[0].Text) </s> remove assert.True(t, err == nil)
assert.True(t, res.IsFiltered && res.Reason == FilteredBlockList)
</s> add assert.Nil(t, err)
assert.True(t, res.IsFiltered)
assert.Equal(t, res.Reason, FilteredBlockList) </s> remove assert.True(t, res.Rules[0].Text == "||host2^")
</s> add assert.Equal(t, "||host2^", res.Rules[0].Text) </s> remove assert.True(t, err == nil)
assert.True(t, !res.IsFiltered && res.Reason == NotFilteredAllowList)
</s> add assert.Nil(t, err)
assert.False(t, res.IsFiltered)
assert.Equal(t, res.Reason, NotFilteredAllowList) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/dnsfilter_test.go |
assert.Empty(t, res.CanonName) | <mask> host := path.Base(t.Name())
<mask>
<mask> res, err := f.CheckHostRules(host, dtyp, setts)
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, "", res.CanonName)
<mask>
<mask> if dnsrr := res.DNSRewriteResult; assert.NotNil(t, dnsrr) {
<mask> assert.Equal(t, dns.RcodeSuccess, dnsrr.RCode)
<mask> if ipVals := dnsrr.Response[dtyp]; assert.Len(t, ipVals, 1) {
<mask> assert.Equal(t, ipv4p1, ipVals[0])
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, "", res.CanonName)
assert.Len(t, res.Rules, 0)
</s> add assert.Empty(t, res.CanonName)
assert.Empty(t, res.Rules) </s> remove assert.Equal(t, 1, len(ips))
</s> add assert.Len(t, ips, 1) </s> remove assert.Len(t, res.Rules, 0)
</s> add assert.Empty(t, res.Rules) </s> remove assert.Equal(t, 1, len(msg.Answer))
</s> add assert.Len(t, msg.Answer, 1) </s> remove assert.True(t, res.Rules[0].Text == "||host1^")
</s> add assert.Equal(t, "||host1^", res.Rules[0].Text) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/dnsrewrite_test.go |
assert.Empty(t, res.CanonName)
assert.Empty(t, res.Rules) | <mask> host := path.Base(t.Name())
<mask>
<mask> res, err := f.CheckHostRules(host, dtyp, setts)
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, "", res.CanonName)
<mask> assert.Len(t, res.Rules, 0)
<mask> })
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, "", res.CanonName)
</s> add assert.Empty(t, res.CanonName) </s> remove assert.Len(t, res.Rules, 0)
</s> add assert.Empty(t, res.Rules) </s> remove assert.Len(t, res.Rules, 0)
</s> add assert.Empty(t, res.Rules) </s> remove assert.Len(t, res.Rules[0].IP, 0)
</s> add assert.Empty(t, res.Rules[0].IP) </s> remove assert.Len(t, res.Rules[0].IP, 0)
</s> add assert.Empty(t, res.Rules[0].IP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/dnsrewrite_test.go |
assert.Len(t, r.IPList, 2)
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4}))
assert.True(t, r.IPList[1].Equal(net.IP{1, 2, 3, 5})) | <mask>
<mask> r = d.processRewrites("www.host.com", dns.TypeA)
<mask> assert.Equal(t, Rewritten, r.Reason)
<mask> assert.Equal(t, "host.com", r.CanonName)
<mask> assert.Equal(t, 2, len(r.IPList))
<mask> assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
<mask> assert.True(t, r.IPList[1].Equal(net.ParseIP("1.2.3.5")))
<mask>
<mask> r = d.processRewrites("www.host.com", dns.TypeAAAA)
<mask> assert.Equal(t, Rewritten, r.Reason)
<mask> assert.Equal(t, "host.com", r.CanonName)
<mask> assert.Equal(t, 1, len(r.IPList))
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) </s> remove assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) </s> remove assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.5")))
</s> add assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 5})) </s> remove assert.True(t, len(r.IPList) == 1)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.Len(t, r.IPList, 1)
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/rewrites_test.go |
assert.Len(t, r.IPList, 1) | <mask>
<mask> r = d.processRewrites("www.host.com", dns.TypeAAAA)
<mask> assert.Equal(t, Rewritten, r.Reason)
<mask> assert.Equal(t, "host.com", r.CanonName)
<mask> assert.Equal(t, 1, len(r.IPList))
<mask> assert.True(t, r.IPList[0].Equal(net.ParseIP("1:2:3::4")))
<mask>
<mask> // wildcard
<mask> d.Rewrites = []RewriteEntry{
<mask> {"host.com", "1.2.3.4", 0, nil},
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) </s> remove assert.True(t, len(r.IPList) == 1)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.Len(t, r.IPList, 1)
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) </s> remove assert.Equal(t, 2, len(r.IPList))
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
assert.True(t, r.IPList[1].Equal(net.ParseIP("1.2.3.5")))
</s> add assert.Len(t, r.IPList, 2)
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4}))
assert.True(t, r.IPList[1].Equal(net.IP{1, 2, 3, 5})) </s> remove assert.True(t, len(r.IPList) == 1)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.Len(t, r.IPList, 1)
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/rewrites_test.go |
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) | <mask> }
<mask> d.prepareRewrites()
<mask> r = d.processRewrites("host.com", dns.TypeA)
<mask> assert.Equal(t, Rewritten, r.Reason)
<mask> assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
<mask>
<mask> r = d.processRewrites("www.host.com", dns.TypeA)
<mask> assert.Equal(t, Rewritten, r.Reason)
<mask> assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.5")))
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.5")))
</s> add assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 5})) </s> remove assert.Equal(t, 2, len(r.IPList))
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
assert.True(t, r.IPList[1].Equal(net.ParseIP("1.2.3.5")))
</s> add assert.Len(t, r.IPList, 2)
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4}))
assert.True(t, r.IPList[1].Equal(net.IP{1, 2, 3, 5})) </s> remove assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/rewrites_test.go |
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 5})) | <mask> assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
<mask>
<mask> r = d.processRewrites("www.host.com", dns.TypeA)
<mask> assert.Equal(t, Rewritten, r.Reason)
<mask> assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.5")))
<mask>
<mask> r = d.processRewrites("www.host2.com", dns.TypeA)
<mask> assert.Equal(t, NotFilteredNotFound, r.Reason)
<mask>
<mask> // override a wildcard
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) </s> remove assert.Equal(t, 2, len(r.IPList))
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
assert.True(t, r.IPList[1].Equal(net.ParseIP("1.2.3.5")))
</s> add assert.Len(t, r.IPList, 2)
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4}))
assert.True(t, r.IPList[1].Equal(net.IP{1, 2, 3, 5})) </s> remove assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/rewrites_test.go |
assert.Len(t, r.IPList, 1)
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) | <mask> }
<mask> d.prepareRewrites()
<mask> r = d.processRewrites("a.host.com", dns.TypeA)
<mask> assert.Equal(t, Rewritten, r.Reason)
<mask> assert.True(t, len(r.IPList) == 1)
<mask> assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
<mask>
<mask> // wildcard + CNAME
<mask> d.Rewrites = []RewriteEntry{
<mask> {"host.com", "1.2.3.4", 0, nil},
<mask> {"*.host.com", "host.com", 0, nil},
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, len(r.IPList) == 1)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.Len(t, r.IPList, 1)
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) </s> remove assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.True(t, len(r.IPList) == 1)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.Len(t, r.IPList, 1)
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) </s> remove assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/rewrites_test.go |
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) | <mask> d.prepareRewrites()
<mask> r = d.processRewrites("www.host.com", dns.TypeA)
<mask> assert.Equal(t, Rewritten, r.Reason)
<mask> assert.Equal(t, "host.com", r.CanonName)
<mask> assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
<mask>
<mask> // 2 CNAMEs
<mask> d.Rewrites = []RewriteEntry{
<mask> {"b.host.com", "a.host.com", 0, nil},
<mask> {"a.host.com", "host.com", 0, nil},
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, len(r.IPList) == 1)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.Len(t, r.IPList, 1)
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) </s> remove assert.True(t, len(r.IPList) == 1)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.Len(t, r.IPList, 1)
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 2, len(r.IPList))
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
assert.True(t, r.IPList[1].Equal(net.ParseIP("1.2.3.5")))
</s> add assert.Len(t, r.IPList, 2)
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4}))
assert.True(t, r.IPList[1].Equal(net.IP{1, 2, 3, 5})) </s> remove assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/rewrites_test.go |
assert.Len(t, r.IPList, 1)
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) | <mask> d.prepareRewrites()
<mask> r = d.processRewrites("b.host.com", dns.TypeA)
<mask> assert.Equal(t, Rewritten, r.Reason)
<mask> assert.Equal(t, "host.com", r.CanonName)
<mask> assert.True(t, len(r.IPList) == 1)
<mask> assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
<mask>
<mask> // 2 CNAMEs + wildcard
<mask> d.Rewrites = []RewriteEntry{
<mask> {"b.host.com", "a.host.com", 0, nil},
<mask> {"a.host.com", "x.somehost.com", 0, nil},
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) </s> remove assert.True(t, len(r.IPList) == 1)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.Len(t, r.IPList, 1)
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.True(t, len(r.IPList) == 1)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.Len(t, r.IPList, 1)
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) </s> remove assert.Equal(t, 2, len(r.IPList))
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
assert.True(t, r.IPList[1].Equal(net.ParseIP("1.2.3.5")))
</s> add assert.Len(t, r.IPList, 2)
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4}))
assert.True(t, r.IPList[1].Equal(net.IP{1, 2, 3, 5})) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/rewrites_test.go |
assert.Len(t, r.IPList, 1)
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) | <mask> d.prepareRewrites()
<mask> r = d.processRewrites("b.host.com", dns.TypeA)
<mask> assert.Equal(t, Rewritten, r.Reason)
<mask> assert.Equal(t, "x.somehost.com", r.CanonName)
<mask> assert.True(t, len(r.IPList) == 1)
<mask> assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
<mask> }
<mask>
<mask> func TestRewritesLevels(t *testing.T) {
<mask> d := DNSFilter{}
<mask> // exact host, wildcard L2, wildcard L3
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, len(r.IPList) == 1)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.Len(t, r.IPList, 1)
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) </s> remove assert.True(t, len(r.IPList) == 1)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.Len(t, r.IPList, 1)
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.5")))
</s> add assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 5})) </s> remove assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/rewrites_test.go |
assert.Len(t, r.IPList, 1) | <mask>
<mask> // match exact
<mask> r := d.processRewrites("host.com", dns.TypeA)
<mask> assert.Equal(t, Rewritten, r.Reason)
<mask> assert.Equal(t, 1, len(r.IPList))
<mask> assert.Equal(t, "1.1.1.1", r.IPList[0].String())
<mask>
<mask> // match L2
<mask> r = d.processRewrites("sub.host.com", dns.TypeA)
<mask> assert.Equal(t, Rewritten, r.Reason)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/rewrites_test.go |
assert.Len(t, r.IPList, 1) | <mask>
<mask> // match L2
<mask> r = d.processRewrites("sub.host.com", dns.TypeA)
<mask> assert.Equal(t, Rewritten, r.Reason)
<mask> assert.Equal(t, 1, len(r.IPList))
<mask> assert.Equal(t, "2.2.2.2", r.IPList[0].String())
<mask>
<mask> // match L3
<mask> r = d.processRewrites("my.sub.host.com", dns.TypeA)
<mask> assert.Equal(t, Rewritten, r.Reason)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/rewrites_test.go |
assert.Len(t, r.IPList, 1) | <mask>
<mask> // match L3
<mask> r = d.processRewrites("my.sub.host.com", dns.TypeA)
<mask> assert.Equal(t, Rewritten, r.Reason)
<mask> assert.Equal(t, 1, len(r.IPList))
<mask> assert.Equal(t, "3.3.3.3", r.IPList[0].String())
<mask> }
<mask>
<mask> func TestRewritesExceptionCNAME(t *testing.T) {
<mask> d := DNSFilter{}
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/rewrites_test.go |
assert.Len(t, r.IPList, 1) | <mask>
<mask> // match sub-domain
<mask> r := d.processRewrites("my.host.com", dns.TypeA)
<mask> assert.Equal(t, Rewritten, r.Reason)
<mask> assert.Equal(t, 1, len(r.IPList))
<mask> assert.Equal(t, "2.2.2.2", r.IPList[0].String())
<mask>
<mask> // match sub-domain, but handle exception
<mask> r = d.processRewrites("sub.host.com", dns.TypeA)
<mask> assert.Equal(t, NotFilteredNotFound, r.Reason)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/rewrites_test.go |
assert.Len(t, r.IPList, 1) | <mask>
<mask> // match sub-domain
<mask> r := d.processRewrites("my.host.com", dns.TypeA)
<mask> assert.Equal(t, Rewritten, r.Reason)
<mask> assert.Equal(t, 1, len(r.IPList))
<mask> assert.Equal(t, "2.2.2.2", r.IPList[0].String())
<mask>
<mask> // match sub-domain, but handle exception
<mask> r = d.processRewrites("my.sub.host.com", dns.TypeA)
<mask> assert.Equal(t, NotFilteredNotFound, r.Reason)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/rewrites_test.go |
assert.Len(t, r.IPList, 1) | <mask>
<mask> // match domain
<mask> r := d.processRewrites("host.com", dns.TypeA)
<mask> assert.Equal(t, Rewritten, r.Reason)
<mask> assert.Equal(t, 1, len(r.IPList))
<mask> assert.Equal(t, "1.2.3.4", r.IPList[0].String())
<mask>
<mask> // match exception
<mask> r = d.processRewrites("host.com", dns.TypeAAAA)
<mask> assert.Equal(t, NotFilteredNotFound, r.Reason)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/rewrites_test.go |
assert.Len(t, r.IPList, 1) | <mask>
<mask> // match domain
<mask> r = d.processRewrites("host2.com", dns.TypeAAAA)
<mask> assert.Equal(t, Rewritten, r.Reason)
<mask> assert.Equal(t, 1, len(r.IPList))
<mask> assert.Equal(t, "::1", r.IPList[0].String())
<mask>
<mask> // match exception
<mask> r = d.processRewrites("host3.com", dns.TypeA)
<mask> assert.Equal(t, NotFilteredNotFound, r.Reason)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 0, len(r.IPList))
</s> add assert.Empty(t, r.IPList) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/rewrites_test.go |
assert.Empty(t, r.IPList) | <mask>
<mask> // match domain
<mask> r = d.processRewrites("host3.com", dns.TypeAAAA)
<mask> assert.Equal(t, Rewritten, r.Reason)
<mask> assert.Equal(t, 0, len(r.IPList))
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) </s> remove assert.Equal(t, 1, len(r.IPList))
</s> add assert.Len(t, r.IPList, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/rewrites_test.go |
{94, 140, 14, 15},
{94, 140, 15, 16}, | <mask> d.parentalServer = defaultParentalServer
<mask> opts := upstream.Options{
<mask> Timeout: dnsTimeout,
<mask> ServerIPAddrs: []net.IP{
<mask> net.ParseIP("94.140.14.15"),
<mask> net.ParseIP("94.140.15.16"),
<mask> net.ParseIP("2a10:50c0::bad1:ff"),
<mask> net.ParseIP("2a10:50c0::bad2:ff"),
<mask> },
<mask> }
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, err == nil)
s.conf.dnsIPAddrs = []net.IP{net.ParseIP("192.168.10.1").To4()}
</s> add assert.Nil(t, err)
s.conf.dnsIPAddrs = []net.IP{{192, 168, 10, 1}} </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove mac, _ := net.ParseMAC(lj.HWAddr)
lease := Lease{
IP: ip,
HWAddr: mac,
Hostname: lj.Hostname,
}
</s> add lease.IP = ip4
lease.Hostname = lj.Hostname </s> remove a := ipFromAddr(&addr)
assert.True(t, a == "1:2:3::4")
</s> add assert.Equal(t, IPStringFromAddr(&addr), net.ParseIP("1:2:3::4").String()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/safebrowsing.go |
assert.Len(t, hashes, 3) | <mask>
<mask> func TestSafeBrowsingHash(t *testing.T) {
<mask> // test hostnameToHashes()
<mask> hashes := hostnameToHashes("1.2.3.sub.host.com")
<mask> assert.Equal(t, 3, len(hashes))
<mask> _, ok := hashes[sha256.Sum256([]byte("3.sub.host.com"))]
<mask> assert.True(t, ok)
<mask> _, ok = hashes[sha256.Sum256([]byte("sub.host.com"))]
<mask> assert.True(t, ok)
<mask> _, ok = hashes[sha256.Sum256([]byte("host.com"))]
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 0, c.getCached())
</s> add assert.Empty(t, c.getCached()) </s> remove assert.Equal(t, 1, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 1) </s> remove assert.Equal(t, 1, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 1) </s> remove assert.Equal(t, 1, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 1) </s> remove assert.Equal(t, nil, err)
</s> add assert.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/safebrowsing_test.go |
assert.Contains(t, q, "7a1b.")
assert.Contains(t, q, "af5a.")
assert.Contains(t, q, "eb11.") | <mask> }
<mask>
<mask> q := c.getQuestion()
<mask>
<mask> assert.True(t, strings.Contains(q, "7a1b."))
<mask> assert.True(t, strings.Contains(q, "af5a."))
<mask> assert.True(t, strings.Contains(q, "eb11."))
<mask> assert.True(t, strings.HasSuffix(q, "sb.dns.adguard.com."))
<mask> }
<mask>
<mask> func TestSafeBrowsingCache(t *testing.T) {
<mask> c := &sbCtx{
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, SplitNext(&s, ',') == "a")
assert.True(t, SplitNext(&s, ',') == "b")
assert.True(t, SplitNext(&s, ',') == "c" && len(s) == 0)
</s> add assert.Equal(t, "a", SplitNext(&s, ','))
assert.Equal(t, "b", SplitNext(&s, ','))
assert.Equal(t, "c", SplitNext(&s, ','))
assert.Empty(t, s) </s> remove assert.True(t, !isValidSubnetMask([]byte{255, 255, 253, 0}))
assert.True(t, !isValidSubnetMask([]byte{255, 255, 255, 1}))
</s> add assert.False(t, isValidSubnetMask([]byte{255, 255, 253, 0}))
assert.False(t, isValidSubnetMask([]byte{255, 255, 255, 1})) </s> remove assert.True(t, clients.ipHost["1.1.1.2"] == nil)
</s> add assert.Nil(t, clients.ipHost["1.1.1.2"]) </s> remove assert.True(t, a.Init(nil, []string{"1.1.1.1", "2.2.0.0/16"}, nil) == nil)
</s> add assert.Nil(t, a.Init(nil, []string{"1.1.1.1", "2.2.0.0/16"}, nil)) </s> remove a = ipFromAddr(nil)
assert.True(t, a == "")
</s> add assert.Empty(t, IPStringFromAddr(nil)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/safebrowsing_test.go |
assert.Empty(t, c.getCached()) | <mask> hash = sha256.Sum256([]byte("sub.host.com"))
<mask> c.hashToHost[hash] = "sub.host.com"
<mask> hash = sha256.Sum256([]byte("nonexisting.com"))
<mask> c.hashToHost[hash] = "nonexisting.com"
<mask> assert.Equal(t, 0, c.getCached())
<mask>
<mask> hash = sha256.Sum256([]byte("sub.host.com"))
<mask> _, ok := c.hashToHost[hash]
<mask> assert.False(t, ok)
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 0, c.getCached())
</s> add assert.Empty(t, c.getCached()) </s> remove assert.Equal(t, 3, len(hashes))
</s> add assert.Len(t, hashes, 3) </s> remove assert.Equal(t, 1, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 1) </s> remove assert.Equal(t, 1, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 1) </s> remove assert.Equal(t, 1, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/safebrowsing_test.go |
assert.Empty(t, c.getCached()) | <mask> c.hashToHost = make(map[[32]byte]string)
<mask> c.hashToHost[hash] = "sub.host.com"
<mask>
<mask> c.cache.Set(hash[0:2], make([]byte, 32))
<mask> assert.Equal(t, 0, c.getCached())
<mask> }
<mask>
<mask> // testErrUpstream implements upstream.Upstream interface for replacing real
<mask> // upstream in tests.
<mask> type testErrUpstream struct{}
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 0, c.getCached())
</s> add assert.Empty(t, c.getCached()) </s> remove func TestIpFromAddr(t *testing.T) {
</s> add func TestIPStringFromAddr(t *testing.T) { </s> remove e.Client = net.ParseIP("127.0.0.1")
</s> add e.Client = net.IP{127, 0, 0, 1} </s> remove func updateStaticIPdhcpcdConf(ifaceName, ip, gatewayIP, dnsIP string) string {
</s> add func updateStaticIPdhcpcdConf(ifaceName, ip string, gatewayIP, dnsIP net.IP) string { </s> remove s.conf.ipStart, err = parseIPv4(conf.RangeStart)
</s> add s.conf.ipStart, err = tryTo4(conf.RangeStart) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsfilter/safebrowsing_test.go |
assert.Nil(t, a.Init([]string{"1.1.1.1", "2.2.0.0/16"}, nil, nil)) | <mask> )
<mask>
<mask> func TestIsBlockedIPAllowed(t *testing.T) {
<mask> a := &accessCtx{}
<mask> assert.True(t, a.Init([]string{"1.1.1.1", "2.2.0.0/16"}, nil, nil) == nil)
<mask>
<mask> disallowed, disallowedRule := a.IsBlockedIP("1.1.1.1")
<mask> assert.False(t, disallowed)
<mask> assert.Equal(t, "", disallowedRule)
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) </s> remove assert.True(t, a.Init(nil, []string{"1.1.1.1", "2.2.0.0/16"}, nil) == nil)
</s> add assert.Nil(t, a.Init(nil, []string{"1.1.1.1", "2.2.0.0/16"}, nil)) </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/access_test.go |
assert.Empty(t, disallowedRule) | <mask> assert.True(t, a.Init([]string{"1.1.1.1", "2.2.0.0/16"}, nil, nil) == nil)
<mask>
<mask> disallowed, disallowedRule := a.IsBlockedIP("1.1.1.1")
<mask> assert.False(t, disallowed)
<mask> assert.Equal(t, "", disallowedRule)
<mask>
<mask> disallowed, disallowedRule = a.IsBlockedIP("1.1.1.2")
<mask> assert.True(t, disallowed)
<mask> assert.Equal(t, "", disallowedRule)
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) </s> remove assert.True(t, a.Init([]string{"1.1.1.1", "2.2.0.0/16"}, nil, nil) == nil)
</s> add assert.Nil(t, a.Init([]string{"1.1.1.1", "2.2.0.0/16"}, nil, nil)) </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/access_test.go |
assert.Empty(t, disallowedRule) | <mask> assert.Equal(t, "", disallowedRule)
<mask>
<mask> disallowed, disallowedRule = a.IsBlockedIP("1.1.1.2")
<mask> assert.True(t, disallowed)
<mask> assert.Equal(t, "", disallowedRule)
<mask>
<mask> disallowed, disallowedRule = a.IsBlockedIP("2.2.1.1")
<mask> assert.False(t, disallowed)
<mask> assert.Equal(t, "", disallowedRule)
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/access_test.go |
assert.Empty(t, disallowedRule) | <mask> assert.Equal(t, "", disallowedRule)
<mask>
<mask> disallowed, disallowedRule = a.IsBlockedIP("2.2.1.1")
<mask> assert.False(t, disallowed)
<mask> assert.Equal(t, "", disallowedRule)
<mask>
<mask> disallowed, disallowedRule = a.IsBlockedIP("2.3.1.1")
<mask> assert.True(t, disallowed)
<mask> assert.Equal(t, "", disallowedRule)
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/access_test.go |
assert.Empty(t, disallowedRule) | <mask> assert.Equal(t, "", disallowedRule)
<mask>
<mask> disallowed, disallowedRule = a.IsBlockedIP("2.3.1.1")
<mask> assert.True(t, disallowed)
<mask> assert.Equal(t, "", disallowedRule)
<mask> }
<mask>
<mask> func TestIsBlockedIPDisallowed(t *testing.T) {
<mask> a := &accessCtx{}
<mask> assert.True(t, a.Init(nil, []string{"1.1.1.1", "2.2.0.0/16"}, nil) == nil)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, a.Init(nil, []string{"1.1.1.1", "2.2.0.0/16"}, nil) == nil)
</s> add assert.Nil(t, a.Init(nil, []string{"1.1.1.1", "2.2.0.0/16"}, nil)) </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) </s> remove assert.True(t, a.Init([]string{"1.1.1.1", "2.2.0.0/16"}, nil, nil) == nil)
</s> add assert.Nil(t, a.Init([]string{"1.1.1.1", "2.2.0.0/16"}, nil, nil)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/access_test.go |
assert.Nil(t, a.Init(nil, []string{"1.1.1.1", "2.2.0.0/16"}, nil)) | <mask> }
<mask>
<mask> func TestIsBlockedIPDisallowed(t *testing.T) {
<mask> a := &accessCtx{}
<mask> assert.True(t, a.Init(nil, []string{"1.1.1.1", "2.2.0.0/16"}, nil) == nil)
<mask>
<mask> disallowed, disallowedRule := a.IsBlockedIP("1.1.1.1")
<mask> assert.True(t, disallowed)
<mask> assert.Equal(t, "1.1.1.1", disallowedRule)
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) </s> remove assert.True(t, a.Init([]string{"1.1.1.1", "2.2.0.0/16"}, nil, nil) == nil)
</s> add assert.Nil(t, a.Init([]string{"1.1.1.1", "2.2.0.0/16"}, nil, nil)) </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/access_test.go |
assert.Empty(t, disallowedRule) | <mask> assert.Equal(t, "1.1.1.1", disallowedRule)
<mask>
<mask> disallowed, disallowedRule = a.IsBlockedIP("1.1.1.2")
<mask> assert.False(t, disallowed)
<mask> assert.Equal(t, "", disallowedRule)
<mask>
<mask> disallowed, disallowedRule = a.IsBlockedIP("2.2.1.1")
<mask> assert.True(t, disallowed)
<mask> assert.Equal(t, "2.2.0.0/16", disallowedRule)
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/access_test.go |
assert.Empty(t, disallowedRule) | <mask> assert.Equal(t, "2.2.0.0/16", disallowedRule)
<mask>
<mask> disallowed, disallowedRule = a.IsBlockedIP("2.3.1.1")
<mask> assert.False(t, disallowed)
<mask> assert.Equal(t, "", disallowedRule)
<mask> }
<mask>
<mask> func TestIsBlockedIPBlockedDomain(t *testing.T) {
<mask> a := &accessCtx{}
<mask> assert.True(t, a.Init(nil, nil, []string{
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) </s> remove assert.True(t, a.Init([]string{"1.1.1.1", "2.2.0.0/16"}, nil, nil) == nil)
</s> add assert.Nil(t, a.Init([]string{"1.1.1.1", "2.2.0.0/16"}, nil, nil)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/access_test.go |
assert.False(t, a.IsBlockedDomain("host3")) | <mask>
<mask> // match by "host2.com"
<mask> assert.True(t, a.IsBlockedDomain("host1"))
<mask> assert.True(t, a.IsBlockedDomain("host2"))
<mask> assert.True(t, !a.IsBlockedDomain("host3"))
<mask>
<mask> // match by wildcard "*.host.com"
<mask> assert.True(t, !a.IsBlockedDomain("host.com"))
<mask> assert.True(t, a.IsBlockedDomain("asdf.host.com"))
<mask> assert.True(t, a.IsBlockedDomain("qwer.asdf.host.com"))
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, !a.IsBlockedDomain("host.com"))
</s> add assert.False(t, a.IsBlockedDomain("host.com")) </s> remove assert.True(t, !a.IsBlockedDomain("asdf.zhost.com"))
</s> add assert.False(t, a.IsBlockedDomain("asdf.zhost.com")) </s> remove assert.True(t, err == nil)
assert.True(t, res.IsFiltered && res.Reason == FilteredBlockList)
</s> add assert.Nil(t, err)
assert.True(t, res.IsFiltered)
assert.Equal(t, res.Reason, FilteredBlockList) </s> remove assert.True(t, err == nil)
assert.True(t, !res.IsFiltered && res.Reason == NotFilteredAllowList)
</s> add assert.Nil(t, err)
assert.False(t, res.IsFiltered)
assert.Equal(t, res.Reason, NotFilteredAllowList) </s> remove assert.True(t, res.Rules[0].Text == "||host1^")
</s> add assert.Equal(t, "||host1^", res.Rules[0].Text) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/access_test.go |
assert.False(t, a.IsBlockedDomain("host.com")) | <mask> assert.True(t, a.IsBlockedDomain("host2"))
<mask> assert.True(t, !a.IsBlockedDomain("host3"))
<mask>
<mask> // match by wildcard "*.host.com"
<mask> assert.True(t, !a.IsBlockedDomain("host.com"))
<mask> assert.True(t, a.IsBlockedDomain("asdf.host.com"))
<mask> assert.True(t, a.IsBlockedDomain("qwer.asdf.host.com"))
<mask> assert.True(t, !a.IsBlockedDomain("asdf.zhost.com"))
<mask>
<mask> // match by wildcard "||host3.com^"
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, !a.IsBlockedDomain("asdf.zhost.com"))
</s> add assert.False(t, a.IsBlockedDomain("asdf.zhost.com")) </s> remove assert.True(t, !a.IsBlockedDomain("host3"))
</s> add assert.False(t, a.IsBlockedDomain("host3")) </s> remove assert.True(t, len(r.IPList) == 1)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.Len(t, r.IPList, 1)
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) </s> remove assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.5")))
</s> add assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 5})) </s> remove assert.True(t, err == nil)
assert.True(t, res.IsFiltered && res.Reason == FilteredBlockList)
</s> add assert.Nil(t, err)
assert.True(t, res.IsFiltered)
assert.Equal(t, res.Reason, FilteredBlockList) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/access_test.go |
assert.False(t, a.IsBlockedDomain("asdf.zhost.com")) | <mask> // match by wildcard "*.host.com"
<mask> assert.True(t, !a.IsBlockedDomain("host.com"))
<mask> assert.True(t, a.IsBlockedDomain("asdf.host.com"))
<mask> assert.True(t, a.IsBlockedDomain("qwer.asdf.host.com"))
<mask> assert.True(t, !a.IsBlockedDomain("asdf.zhost.com"))
<mask>
<mask> // match by wildcard "||host3.com^"
<mask> assert.True(t, a.IsBlockedDomain("host3.com"))
<mask> assert.True(t, a.IsBlockedDomain("asdf.host3.com"))
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, !a.IsBlockedDomain("host.com"))
</s> add assert.False(t, a.IsBlockedDomain("host.com")) </s> remove assert.True(t, !a.IsBlockedDomain("host3"))
</s> add assert.False(t, a.IsBlockedDomain("host3")) </s> remove assert.True(t, len(r.IPList) == 1)
assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.4")))
</s> add assert.Len(t, r.IPList, 1)
assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 4})) </s> remove assert.True(t, err == nil)
assert.True(t, res.IsFiltered && res.Reason == FilteredBlockList)
</s> add assert.Nil(t, err)
assert.True(t, res.IsFiltered)
assert.Equal(t, res.Reason, FilteredBlockList) </s> remove assert.True(t, r.IPList[0].Equal(net.ParseIP("1.2.3.5")))
</s> add assert.True(t, r.IPList[0].Equal(net.IP{1, 2, 3, 5})) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/access_test.go |
// TODO(e.burkov): replace argument type with net.IP. | <mask> FilterHandler func(clientAddr string, settings *dnsfilter.RequestFilteringSettings) `yaml:"-"`
<mask>
<mask> // GetCustomUpstreamByClient - a callback function that returns upstreams configuration
<mask> // based on the client IP address. Returns nil if there are no custom upstreams for the client
<mask> GetCustomUpstreamByClient func(clientAddr string) *proxy.UpstreamConfig `yaml:"-"`
<mask>
<mask> // Protection configuration
<mask> // --
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove GatewayIP string `yaml:"gateway_ip"`
SubnetMask string `yaml:"subnet_mask"`
</s> add GatewayIP net.IP `yaml:"gateway_ip"`
SubnetMask net.IP `yaml:"subnet_mask"` </s> remove ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
BlockingMode string `yaml:"blocking_mode"` // mode how to answer filtered requests
BlockingIPv4 string `yaml:"blocking_ipv4"` // IP address to be returned for a blocked A request
BlockingIPv6 string `yaml:"blocking_ipv6"` // IP address to be returned for a blocked AAAA request
BlockingIPAddrv4 net.IP `yaml:"-"`
BlockingIPAddrv6 net.IP `yaml:"-"`
</s> add ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
BlockingMode string `yaml:"blocking_mode"` // mode how to answer filtered requests
BlockingIPv4 net.IP `yaml:"blocking_ipv4"` // IP address to be returned for a blocked A request
BlockingIPv6 net.IP `yaml:"blocking_ipv6"` // IP address to be returned for a blocked AAAA request </s> remove clientIP := ipFromAddr(d.Addr)
</s> add clientIP := IPStringFromAddr(d.Addr) </s> remove assert.True(t, clients.ipHost["1.1.1.1"].WhoisInfo[0][1] == "orgname-val")
</s> add assert.Equal(t, "orgname-val", clients.ipHost["1.1.1.1"].WhoisInfo[0][1]) </s> remove func updateStaticIPdhcpcdConf(ifaceName, ip, gatewayIP, dnsIP string) string {
</s> add func updateStaticIPdhcpcdConf(ifaceName, ip string, gatewayIP, dnsIP net.IP) string { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/config.go |
ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
BlockingMode string `yaml:"blocking_mode"` // mode how to answer filtered requests
BlockingIPv4 net.IP `yaml:"blocking_ipv4"` // IP address to be returned for a blocked A request
BlockingIPv6 net.IP `yaml:"blocking_ipv6"` // IP address to be returned for a blocked AAAA request | <mask>
<mask> // Protection configuration
<mask> // --
<mask>
<mask> ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
<mask> BlockingMode string `yaml:"blocking_mode"` // mode how to answer filtered requests
<mask> BlockingIPv4 string `yaml:"blocking_ipv4"` // IP address to be returned for a blocked A request
<mask> BlockingIPv6 string `yaml:"blocking_ipv6"` // IP address to be returned for a blocked AAAA request
<mask> BlockingIPAddrv4 net.IP `yaml:"-"`
<mask> BlockingIPAddrv6 net.IP `yaml:"-"`
<mask> BlockedResponseTTL uint32 `yaml:"blocked_response_ttl"` // if 0, then default is used (3600)
<mask>
<mask> // IP (or domain name) which is used to respond to DNS requests blocked by parental control or safe-browsing
<mask> ParentalBlockHost string `yaml:"parental_block_host"`
<mask> SafeBrowsingBlockHost string `yaml:"safebrowsing_block_host"`
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove GatewayIP string `yaml:"gateway_ip"`
SubnetMask string `yaml:"subnet_mask"`
</s> add GatewayIP net.IP `yaml:"gateway_ip"`
SubnetMask net.IP `yaml:"subnet_mask"` </s> remove RangeStart string `yaml:"range_start"`
RangeEnd string `yaml:"range_end"`
</s> add RangeStart net.IP `yaml:"range_start"`
RangeEnd net.IP `yaml:"range_end"` </s> remove IP string `json:"ip"`
</s> add IP net.IP `json:"ip"` </s> remove return s.genARecord(m, s.conf.BlockingIPAddrv4)
</s> add return s.genARecord(m, s.conf.BlockingIPv4) </s> remove GatewayIP string `json:"gateway_ip"`
SubnetMask string `json:"subnet_mask"`
RangeStart string `json:"range_start"`
RangeEnd string `json:"range_end"`
</s> add GatewayIP net.IP `json:"gateway_ip"`
SubnetMask net.IP `json:"subnet_mask"`
RangeStart net.IP `json:"range_start"`
RangeEnd net.IP `json:"range_end"` | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/config.go |
log.Debug("DNS: internal record: %s -> %s", req.Question[0].Name, ip) | <mask> if !ok {
<mask> return resultDone
<mask> }
<mask>
<mask> log.Debug("DNS: internal record: %s -> %s", req.Question[0].Name, ip.String())
<mask>
<mask> resp := s.makeResponse(req)
<mask>
<mask> if req.Question[0].Qtype == dns.TypeA {
<mask> a := &dns.A{}
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove clientIP := ipFromAddr(d.Addr)
</s> add clientIP := IPStringFromAddr(d.Addr) </s> remove ip := net.ParseIP(lj.IP)
if ip != nil && ip.To4() == nil {
mac, err := net.ParseMAC(lj.HWAddr)
</s> add if lj.IP == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
ip4 := lj.IP.To4()
mac, err := net.ParseMAC(lj.HWAddr)
lease := Lease{
HWAddr: mac,
}
if ip4 == nil {
lease.IP = lj.IP.To16()
</s> remove ip := net.ParseIP(lj.IP)
if ip != nil && ip.To4() == nil {
mac, err := net.ParseMAC(lj.HWAddr)
</s> add if lj.IP == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
ip4 := lj.IP.To4()
mac, err := net.ParseMAC(lj.HWAddr)
lease := Lease{
HWAddr: mac,
}
if ip4 == nil {
lease.IP = lj.IP.To16()
</s> remove // Pass request to upstream servers; process the response
</s> add // processUpstream passes request to upstream servers and handles the response. </s> remove ip := ipFromAddr(d.Addr)
</s> add ip := IPStringFromAddr(d.Addr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/dns.go |
// processUpstream passes request to upstream servers and handles the response. | <mask> }
<mask> return resultDone
<mask> }
<mask>
<mask> // Pass request to upstream servers; process the response
<mask> func processUpstream(ctx *dnsContext) int {
<mask> s := ctx.srv
<mask> d := ctx.proxyCtx
<mask> if d.Res != nil {
<mask> return resultDone // response is already set - nothing to do
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove clientIP := ipFromAddr(d.Addr)
</s> add clientIP := IPStringFromAddr(d.Addr) </s> remove log.Debug("DNS: internal record: %s -> %s", req.Question[0].Name, ip.String())
</s> add log.Debug("DNS: internal record: %s -> %s", req.Question[0].Name, ip) </s> remove func parseIPv4(text string) (net.IP, error) {
result := net.ParseIP(text)
if result == nil {
return nil, fmt.Errorf("%s is not an IP address", text)
</s> add func tryTo4(ip net.IP) (ip4 net.IP, err error) {
if ip == nil {
return nil, fmt.Errorf("%v is not an IP address", ip) </s> remove ip := ipFromAddr(d.Addr)
</s> add ip := IPStringFromAddr(d.Addr) </s> remove ip4 := net.ParseIP(*req.BlockingIPv4)
if ip4 == nil || ip4.To4() == nil {
return false
}
ip6 := net.ParseIP(*req.BlockingIPv6)
return ip6 != nil
</s> add return req.BlockingIPv6 != nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/dns.go |
clientIP := IPStringFromAddr(d.Addr) | <mask> return resultDone // response is already set - nothing to do
<mask> }
<mask>
<mask> if d.Addr != nil && s.conf.GetCustomUpstreamByClient != nil {
<mask> clientIP := ipFromAddr(d.Addr)
<mask> upstreamsConf := s.conf.GetCustomUpstreamByClient(clientIP)
<mask> if upstreamsConf != nil {
<mask> log.Debug("Using custom upstreams for %s", clientIP)
<mask> d.CustomUpstreamConfig = upstreamsConf
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove // Pass request to upstream servers; process the response
</s> add // processUpstream passes request to upstream servers and handles the response. </s> remove ip := net.ParseIP(lj.IP)
if ip != nil && ip.To4() == nil {
mac, err := net.ParseMAC(lj.HWAddr)
</s> add if lj.IP == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
ip4 := lj.IP.To4()
mac, err := net.ParseMAC(lj.HWAddr)
lease := Lease{
HWAddr: mac,
}
if ip4 == nil {
lease.IP = lj.IP.To16()
</s> remove ip := net.ParseIP(lj.IP)
if ip != nil && ip.To4() == nil {
mac, err := net.ParseMAC(lj.HWAddr)
</s> add if lj.IP == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
ip4 := lj.IP.To4()
mac, err := net.ParseMAC(lj.HWAddr)
lease := Lease{
HWAddr: mac,
}
if ip4 == nil {
lease.IP = lj.IP.To16()
</s> remove ip4 := net.ParseIP(*req.BlockingIPv4)
if ip4 == nil || ip4.To4() == nil {
return false
}
ip6 := net.ParseIP(*req.BlockingIPv6)
return ip6 != nil
</s> add return req.BlockingIPv6 != nil </s> remove return
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/dns.go |
if s.conf.BlockingIPv4 == nil || s.conf.BlockingIPv6 == nil { | <mask> // --
<mask> if config != nil {
<mask> s.conf = *config
<mask> if s.conf.BlockingMode == "custom_ip" {
<mask> s.conf.BlockingIPAddrv4 = net.ParseIP(s.conf.BlockingIPv4)
<mask> s.conf.BlockingIPAddrv6 = net.ParseIP(s.conf.BlockingIPv6)
<mask> if s.conf.BlockingIPAddrv4 == nil || s.conf.BlockingIPAddrv6 == nil {
<mask> return fmt.Errorf("dns: invalid custom blocking IP address specified")
<mask> }
<mask> }
<mask> }
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove s.conf.BlockingIPv4 = *dc.BlockingIPv4
s.conf.BlockingIPAddrv4 = net.ParseIP(*dc.BlockingIPv4)
s.conf.BlockingIPv6 = *dc.BlockingIPv6
s.conf.BlockingIPAddrv6 = net.ParseIP(*dc.BlockingIPv6)
</s> add s.conf.BlockingIPv4 = dc.BlockingIPv4.To4()
s.conf.BlockingIPv6 = dc.BlockingIPv6.To16() </s> remove subnet, err := parseIPv4(s.conf.SubnetMask)
if err != nil || !isValidSubnetMask(subnet) {
return s, fmt.Errorf("dhcpv4: invalid subnet mask: %s", s.conf.SubnetMask)
</s> add if s.conf.SubnetMask == nil {
return s, fmt.Errorf("dhcpv4: invalid subnet mask: %v", s.conf.SubnetMask) </s> remove if req.BlockingIPv4 == nil || req.BlockingIPv6 == nil {
</s> add if req.BlockingIPv4.To4() == nil { </s> remove copy(s.conf.subnetMask, subnet)
</s> add copy(s.conf.subnetMask, s.conf.SubnetMask.To4()) </s> remove s.conf.ipEnd, err = parseIPv4(conf.RangeEnd)
</s> add s.conf.ipEnd, err = tryTo4(conf.RangeEnd) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/dnsforward.go |
assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.IP{0, 0, 0, 0})) | <mask> if err != nil {
<mask> t.Fatalf("Couldn't talk to server %s: %s", addr, err)
<mask> }
<mask> assert.Equal(t, dns.RcodeSuccess, reply.Rcode)
<mask> assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.ParseIP("0.0.0.0")))
<mask>
<mask> err = s.Stop()
<mask> if err != nil {
<mask> t.Fatalf("DNS server failed to stop: %s", err)
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.ParseIP("0.0.0.0")))
</s> add assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.IP{0, 0, 0, 0})) </s> remove clientIP := ipFromAddr(d.Addr)
</s> add clientIP := IPStringFromAddr(d.Addr) </s> remove copy(s.conf.subnetMask, subnet)
</s> add copy(s.conf.subnetMask, s.conf.SubnetMask.To4()) </s> remove subnet, err := parseIPv4(s.conf.SubnetMask)
if err != nil || !isValidSubnetMask(subnet) {
return s, fmt.Errorf("dhcpv4: invalid subnet mask: %s", s.conf.SubnetMask)
</s> add if s.conf.SubnetMask == nil {
return s, fmt.Errorf("dhcpv4: invalid subnet mask: %v", s.conf.SubnetMask) </s> remove ip := net.ParseIP(lj.IP)
if ip != nil && ip.To4() == nil {
mac, err := net.ParseMAC(lj.HWAddr)
</s> add if lj.IP == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
ip4 := lj.IP.To4()
mac, err := net.ParseMAC(lj.HWAddr)
lease := Lease{
HWAddr: mac,
}
if ip4 == nil {
lease.IP = lj.IP.To16()
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/dnsforward_test.go |
u.ipv4["host."] = []net.IP{{192, 168, 0, 1}} | <mask> s.conf.GetCustomUpstreamByClient = func(_ string) *proxy.UpstreamConfig {
<mask> uc := &proxy.UpstreamConfig{}
<mask> u := &testUpstream{}
<mask> u.ipv4 = map[string][]net.IP{}
<mask> u.ipv4["host."] = []net.IP{net.ParseIP("192.168.0.1")}
<mask> uc.Upstreams = append(uc.Upstreams, u)
<mask> return uc
<mask> }
<mask>
<mask> assert.Nil(t, s.Start())
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove clientIP := ipFromAddr(d.Addr)
</s> add clientIP := IPStringFromAddr(d.Addr) </s> remove mac, _ := net.ParseMAC(lj.HWAddr)
lease := Lease{
IP: ip,
HWAddr: mac,
Hostname: lj.Hostname,
}
</s> add lease.IP = ip4
lease.Hostname = lj.Hostname </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/dnsforward_test.go |
assert.Nil(t, err) | <mask> s := createTestServer(t)
<mask> testUpstm := &testUpstream{testCNAMEs, testIPv4, nil}
<mask> s.conf.ProtectionEnabled = false
<mask> err := s.startWithUpstream(testUpstm)
<mask> assert.True(t, err == nil)
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
<mask>
<mask> // 'badhost' has a canonical name 'null.example.org' which is blocked by filters:
<mask> // but protection is disabled - response is NOT blocked
<mask> req := createTestMessage("badhost.")
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.Nil(t, err, nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.ParseIP("0.0.0.0")))
</s> add assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.IP{0, 0, 0, 0})) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/dnsforward_test.go |
assert.Nil(t, err) | <mask> func TestBlockCNAME(t *testing.T) {
<mask> s := createTestServer(t)
<mask> testUpstm := &testUpstream{testCNAMEs, testIPv4, nil}
<mask> err := s.startWithUpstream(testUpstm)
<mask> assert.True(t, err == nil)
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
<mask>
<mask> // 'badhost' has a canonical name 'null.example.org' which is blocked by filters:
<mask> // response is blocked
<mask> req := createTestMessage("badhost.")
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.Nil(t, err, nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.ParseIP("0.0.0.0")))
</s> add assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.IP{0, 0, 0, 0})) </s> remove ip := ipFromAddr(d.Addr)
</s> add ip := IPStringFromAddr(d.Addr) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/dnsforward_test.go |
assert.Nil(t, err) | <mask> // 'badhost' has a canonical name 'null.example.org' which is blocked by filters:
<mask> // response is blocked
<mask> req := createTestMessage("badhost.")
<mask> reply, err := dns.Exchange(req, addr.String())
<mask> assert.Nil(t, err, nil)
<mask> assert.Equal(t, dns.RcodeSuccess, reply.Rcode)
<mask> assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.ParseIP("0.0.0.0")))
<mask>
<mask> // 'whitelist.example.org' has a canonical name 'null.example.org' which is blocked by filters
<mask> // but 'whitelist.example.org' is in a whitelist:
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.ParseIP("0.0.0.0")))
</s> add assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.IP{0, 0, 0, 0})) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
BlockingMode string `yaml:"blocking_mode"` // mode how to answer filtered requests
BlockingIPv4 string `yaml:"blocking_ipv4"` // IP address to be returned for a blocked A request
BlockingIPv6 string `yaml:"blocking_ipv6"` // IP address to be returned for a blocked AAAA request
BlockingIPAddrv4 net.IP `yaml:"-"`
BlockingIPAddrv6 net.IP `yaml:"-"`
</s> add ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
BlockingMode string `yaml:"blocking_mode"` // mode how to answer filtered requests
BlockingIPv4 net.IP `yaml:"blocking_ipv4"` // IP address to be returned for a blocked A request
BlockingIPv6 net.IP `yaml:"blocking_ipv6"` // IP address to be returned for a blocked AAAA request </s> remove assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.ParseIP("0.0.0.0")))
</s> add assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.IP{0, 0, 0, 0})) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/dnsforward_test.go |
assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.IP{0, 0, 0, 0})) | <mask> req := createTestMessage("badhost.")
<mask> reply, err := dns.Exchange(req, addr.String())
<mask> assert.Nil(t, err, nil)
<mask> assert.Equal(t, dns.RcodeSuccess, reply.Rcode)
<mask> assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.ParseIP("0.0.0.0")))
<mask>
<mask> // 'whitelist.example.org' has a canonical name 'null.example.org' which is blocked by filters
<mask> // but 'whitelist.example.org' is in a whitelist:
<mask> // response isn't blocked
<mask> req = createTestMessage("whitelist.example.org.")
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Nil(t, err, nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.ParseIP("0.0.0.0")))
</s> add assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.IP{0, 0, 0, 0})) </s> remove assert.Equal(t, 0, len(reply.Answer))
</s> add assert.Empty(t, reply.Answer) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/dnsforward_test.go |
assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.IP{0, 0, 0, 0})) | <mask> req = createTestMessage("example.org.")
<mask> reply, err = dns.Exchange(req, addr.String())
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, dns.RcodeSuccess, reply.Rcode)
<mask> assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.ParseIP("0.0.0.0")))
<mask>
<mask> _ = s.Stop()
<mask> }
<mask>
<mask> func TestClientRulesForCNAMEMatching(t *testing.T) {
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 0, len(reply.Answer))
</s> add assert.Empty(t, reply.Answer) </s> remove assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.ParseIP("0.0.0.0")))
</s> add assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.IP{0, 0, 0, 0})) </s> remove assert.Equal(t, 1, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 1) </s> remove assert.Equal(t, 2, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 2) </s> remove assert.Equal(t, 2, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 2) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/dnsforward_test.go |
conf.BlockingIPv4 = nil | <mask> conf.UDPListenAddr = &net.UDPAddr{Port: 0}
<mask> conf.TCPListenAddr = &net.TCPAddr{Port: 0}
<mask> conf.ProtectionEnabled = true
<mask> conf.BlockingMode = "custom_ip"
<mask> conf.BlockingIPv4 = "bad IP"
<mask> conf.UpstreamDNS = []string{"8.8.8.8:53", "8.8.4.4:53"}
<mask> err := s.Prepare(&conf)
<mask> assert.True(t, err != nil) // invalid BlockingIPv4
<mask>
<mask> conf.BlockingIPv4 = "0.0.0.1"
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, err != nil) // invalid BlockingIPv4
</s> add assert.NotNil(t, err) // invalid BlockingIPv4 </s> remove conf.BlockingIPv4 = "0.0.0.1"
conf.BlockingIPv6 = "::1"
</s> add conf.BlockingIPv4 = net.IP{0, 0, 0, 1}
conf.BlockingIPv6 = net.ParseIP("::1") </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/dnsforward_test.go |
assert.NotNil(t, err) // invalid BlockingIPv4 | <mask> conf.BlockingMode = "custom_ip"
<mask> conf.BlockingIPv4 = "bad IP"
<mask> conf.UpstreamDNS = []string{"8.8.8.8:53", "8.8.4.4:53"}
<mask> err := s.Prepare(&conf)
<mask> assert.True(t, err != nil) // invalid BlockingIPv4
<mask>
<mask> conf.BlockingIPv4 = "0.0.0.1"
<mask> conf.BlockingIPv6 = "::1"
<mask> err = s.Prepare(&conf)
<mask> assert.Nil(t, err)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove conf.BlockingIPv4 = "bad IP"
</s> add conf.BlockingIPv4 = nil </s> remove conf.BlockingIPv4 = "0.0.0.1"
conf.BlockingIPv6 = "::1"
</s> add conf.BlockingIPv4 = net.IP{0, 0, 0, 1}
conf.BlockingIPv6 = net.ParseIP("::1") </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/dnsforward_test.go |
conf.BlockingIPv4 = net.IP{0, 0, 0, 1}
conf.BlockingIPv6 = net.ParseIP("::1") | <mask> conf.UpstreamDNS = []string{"8.8.8.8:53", "8.8.4.4:53"}
<mask> err := s.Prepare(&conf)
<mask> assert.True(t, err != nil) // invalid BlockingIPv4
<mask>
<mask> conf.BlockingIPv4 = "0.0.0.1"
<mask> conf.BlockingIPv6 = "::1"
<mask> err = s.Prepare(&conf)
<mask> assert.Nil(t, err)
<mask> err = s.Start()
<mask> assert.Nil(t, err)
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, err != nil) // invalid BlockingIPv4
</s> add assert.NotNil(t, err) // invalid BlockingIPv4 </s> remove conf.BlockingIPv4 = "bad IP"
</s> add conf.BlockingIPv4 = nil </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/dnsforward_test.go |
assert.Len(t, reply.Answer, 1) | <mask>
<mask> req := createTestMessageWithType("null.example.org.", dns.TypeA)
<mask> reply, err := dns.Exchange(req, addr.String())
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, 1, len(reply.Answer))
<mask> a, ok := reply.Answer[0].(*dns.A)
<mask> assert.True(t, ok)
<mask> assert.Equal(t, "0.0.0.1", a.A.String())
<mask>
<mask> req = createTestMessageWithType("null.example.org.", dns.TypeAAAA)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 1, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 1) </s> remove assert.Equal(t, 1, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 1) </s> remove assert.Equal(t, 0, len(reply.Answer))
</s> add assert.Empty(t, reply.Answer) </s> remove assert.Equal(t, 2, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 2) </s> remove assert.Equal(t, 2, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 2) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/dnsforward_test.go |
assert.Len(t, reply.Answer, 1) | <mask>
<mask> req = createTestMessageWithType("null.example.org.", dns.TypeAAAA)
<mask> reply, err = dns.Exchange(req, addr.String())
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, 1, len(reply.Answer))
<mask> a6, ok := reply.Answer[0].(*dns.AAAA)
<mask> assert.True(t, ok)
<mask> assert.Equal(t, "::1", a6.AAAA.String())
<mask>
<mask> err = s.Stop()
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 1, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 1) </s> remove assert.Equal(t, 1, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 1) </s> remove assert.Equal(t, 0, len(reply.Answer))
</s> add assert.Empty(t, reply.Answer) </s> remove assert.Equal(t, 2, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 2) </s> remove assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.ParseIP("0.0.0.0")))
</s> add assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.IP{0, 0, 0, 0})) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/dnsforward_test.go |
assert.Len(t, reply.Answer, 1) | <mask>
<mask> req := createTestMessageWithType("test.com.", dns.TypeA)
<mask> reply, err := dns.Exchange(req, addr.String())
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, 1, len(reply.Answer))
<mask> a, ok := reply.Answer[0].(*dns.A)
<mask> assert.True(t, ok)
<mask> assert.Equal(t, "1.2.3.4", a.A.String())
<mask>
<mask> req = createTestMessageWithType("test.com.", dns.TypeAAAA)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 1, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 1) </s> remove assert.Equal(t, 0, len(reply.Answer))
</s> add assert.Empty(t, reply.Answer) </s> remove assert.Equal(t, 1, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 1) </s> remove assert.Equal(t, 2, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 2) </s> remove assert.Equal(t, 2, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 2) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/dnsforward_test.go |
assert.Empty(t, reply.Answer) | <mask>
<mask> req = createTestMessageWithType("test.com.", dns.TypeAAAA)
<mask> reply, err = dns.Exchange(req, addr.String())
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, 0, len(reply.Answer))
<mask>
<mask> req = createTestMessageWithType("alias.test.com.", dns.TypeA)
<mask> reply, err = dns.Exchange(req, addr.String())
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, 2, len(reply.Answer))
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 2, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 2) </s> remove assert.Equal(t, 1, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 1) </s> remove assert.Equal(t, 1, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 1) </s> remove assert.Equal(t, 1, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 1) </s> remove assert.Equal(t, 2, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 2) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/dnsforward_test.go |
assert.Len(t, reply.Answer, 2) | <mask>
<mask> req = createTestMessageWithType("alias.test.com.", dns.TypeA)
<mask> reply, err = dns.Exchange(req, addr.String())
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, 2, len(reply.Answer))
<mask> assert.Equal(t, "test.com.", reply.Answer[0].(*dns.CNAME).Target)
<mask> assert.Equal(t, "1.2.3.4", reply.Answer[1].(*dns.A).A.String())
<mask>
<mask> req = createTestMessageWithType("my.alias.example.org.", dns.TypeA)
<mask> reply, err = dns.Exchange(req, addr.String())
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 0, len(reply.Answer))
</s> add assert.Empty(t, reply.Answer) </s> remove assert.Equal(t, 2, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 2) </s> remove assert.Equal(t, 1, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 1) </s> remove assert.Equal(t, 1, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 1) </s> remove assert.Equal(t, 1, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/dnsforward_test.go |
assert.Len(t, reply.Answer, 2) | <mask> req = createTestMessageWithType("my.alias.example.org.", dns.TypeA)
<mask> reply, err = dns.Exchange(req, addr.String())
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, "my.alias.example.org.", reply.Question[0].Name) // the original question is restored
<mask> assert.Equal(t, 2, len(reply.Answer))
<mask> assert.Equal(t, "example.org.", reply.Answer[0].(*dns.CNAME).Target)
<mask> assert.Equal(t, dns.TypeA, reply.Answer[1].Header().Rrtype)
<mask>
<mask> _ = s.Stop()
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 2, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 2) </s> remove assert.Equal(t, 0, len(reply.Answer))
</s> add assert.Empty(t, reply.Answer) </s> remove assert.Equal(t, 1, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 1) </s> remove assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.ParseIP("0.0.0.0")))
</s> add assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.IP{0, 0, 0, 0})) </s> remove assert.Equal(t, 1, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/dnsforward_test.go |
assert.Nil(t, err) | <mask> s.conf.FilteringConfig.ProtectionEnabled = true
<mask> s.conf.ConfigModified = func() {}
<mask>
<mask> err := s.Prepare(nil)
<mask> assert.True(t, err == nil)
<mask> return s
<mask> }
<mask>
<mask> func createServerTLSConfig(t *testing.T) (*tls.Config, []byte, []byte) {
<mask> privateKey, err := rsa.GenerateKey(rand.Reader, 2048)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil)
s.conf.dnsIPAddrs = []net.IP{net.ParseIP("192.168.10.1").To4()}
</s> add assert.Nil(t, err)
s.conf.dnsIPAddrs = []net.IP{{192, 168, 10, 1}} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/dnsforward_test.go |
func TestIPStringFromAddr(t *testing.T) { | <mask> err = ValidateUpstreams(upstreamsSet)
<mask> assert.NotNil(t, err, "there is an invalid upstream in set, but it pass through validation")
<mask> }
<mask>
<mask> func TestIpFromAddr(t *testing.T) {
<mask> addr := net.UDPAddr{}
<mask> addr.IP = net.ParseIP("1:2:3::4")
<mask> addr.Port = 12345
<mask> addr.Zone = "eth0"
<mask> a := ipFromAddr(&addr)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove a := ipFromAddr(&addr)
assert.True(t, a == "1:2:3::4")
</s> add assert.Equal(t, IPStringFromAddr(&addr), net.ParseIP("1:2:3::4").String()) </s> remove a = ipFromAddr(nil)
assert.True(t, a == "")
</s> add assert.Empty(t, IPStringFromAddr(nil)) </s> remove assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.ParseIP("0.0.0.0")))
</s> add assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.IP{0, 0, 0, 0})) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.Nil(t, err, nil)
</s> add assert.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/dnsforward_test.go |
assert.Equal(t, IPStringFromAddr(&addr), net.ParseIP("1:2:3::4").String()) | <mask> addr := net.UDPAddr{}
<mask> addr.IP = net.ParseIP("1:2:3::4")
<mask> addr.Port = 12345
<mask> addr.Zone = "eth0"
<mask> a := ipFromAddr(&addr)
<mask> assert.True(t, a == "1:2:3::4")
<mask>
<mask> a = ipFromAddr(nil)
<mask> assert.True(t, a == "")
<mask> }
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove a = ipFromAddr(nil)
assert.True(t, a == "")
</s> add assert.Empty(t, IPStringFromAddr(nil)) </s> remove func TestIpFromAddr(t *testing.T) {
</s> add func TestIPStringFromAddr(t *testing.T) { </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) </s> remove assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.ParseIP("0.0.0.0")))
</s> add assert.True(t, reply.Answer[0].(*dns.A).A.Equal(net.IP{0, 0, 0, 0})) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/dnsforward_test.go |
assert.Empty(t, IPStringFromAddr(nil)) | <mask> addr.Zone = "eth0"
<mask> a := ipFromAddr(&addr)
<mask> assert.True(t, a == "1:2:3::4")
<mask>
<mask> a = ipFromAddr(nil)
<mask> assert.True(t, a == "")
<mask> }
<mask>
<mask> func TestMatchDNSName(t *testing.T) {
<mask> dnsNames := []string{"host1", "*.host2", "1.2.3.4"}
<mask> sort.Strings(dnsNames)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove a := ipFromAddr(&addr)
assert.True(t, a == "1:2:3::4")
</s> add assert.Equal(t, IPStringFromAddr(&addr), net.ParseIP("1:2:3::4").String()) </s> remove func TestIpFromAddr(t *testing.T) {
</s> add func TestIPStringFromAddr(t *testing.T) { </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) </s> remove assert.Equal(t, "", disallowedRule)
</s> add assert.Empty(t, disallowedRule) </s> remove assert.True(t, a.Init(nil, []string{"1.1.1.1", "2.2.0.0/16"}, nil) == nil)
</s> add assert.Nil(t, a.Init(nil, []string{"1.1.1.1", "2.2.0.0/16"}, nil)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/dnsforward_test.go |
assert.False(t, matchDNSName(dnsNames, "host2"))
assert.False(t, matchDNSName(dnsNames, ""))
assert.False(t, matchDNSName(dnsNames, "*.host2")) | <mask> assert.True(t, matchDNSName(dnsNames, "host1"))
<mask> assert.True(t, matchDNSName(dnsNames, "a.host2"))
<mask> assert.True(t, matchDNSName(dnsNames, "b.a.host2"))
<mask> assert.True(t, matchDNSName(dnsNames, "1.2.3.4"))
<mask> assert.True(t, !matchDNSName(dnsNames, "host2"))
<mask> assert.True(t, !matchDNSName(dnsNames, ""))
<mask> assert.True(t, !matchDNSName(dnsNames, "*.host2"))
<mask> }
<mask>
<mask> type testDHCP struct {
<mask> }
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, !a.IsBlockedDomain("asdf.zhost.com"))
</s> add assert.False(t, a.IsBlockedDomain("asdf.zhost.com")) </s> remove assert.True(t, strings.Contains(q, "7a1b."))
assert.True(t, strings.Contains(q, "af5a."))
assert.True(t, strings.Contains(q, "eb11."))
</s> add assert.Contains(t, q, "7a1b.")
assert.Contains(t, q, "af5a.")
assert.Contains(t, q, "eb11.") </s> remove assert.True(t, !ip6InRange(net.ParseIP("2001::2"), net.ParseIP("2001::1")))
assert.True(t, !ip6InRange(net.ParseIP("2001::2"), net.ParseIP("2002::2")))
</s> add assert.False(t, ip6InRange(net.ParseIP("2001::2"), net.ParseIP("2001::1")))
assert.False(t, ip6InRange(net.ParseIP("2001::2"), net.ParseIP("2002::2"))) </s> remove assert.True(t, err == nil)
assert.True(t, res.IsFiltered && res.Reason == FilteredBlockList)
</s> add assert.Nil(t, err)
assert.True(t, res.IsFiltered)
assert.Equal(t, res.Reason, FilteredBlockList) </s> remove assert.True(t, topClients[0] == "127.0.0.1")
</s> add assert.Equal(t, "127.0.0.1", topClients[0]) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/dnsforward_test.go |
l.IP = net.IP{127, 0, 0, 1} | <mask> }
<mask>
<mask> func (d *testDHCP) Leases(flags int) []dhcpd.Lease {
<mask> l := dhcpd.Lease{}
<mask> l.IP = net.ParseIP("127.0.0.1").To4()
<mask> l.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:aa")
<mask> l.Hostname = "localhost"
<mask> return []dhcpd.Lease{l}
<mask> }
<mask> func (d *testDHCP) SetOnLeaseChanged(onLeaseChanged dhcpd.OnLeaseChangedT) {}
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove l.IP = net.ParseIP("192.168.10.150").To4()
</s> add l.IP = net.IP{192, 168, 10, 150} </s> remove l.IP = net.ParseIP("192.168.10.100").To4()
</s> add l.IP = net.IP{192, 168, 10, 100} </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove assert.True(t, err == nil)
s.conf.dnsIPAddrs = []net.IP{net.ParseIP("192.168.10.1").To4()}
</s> add assert.Nil(t, err)
s.conf.dnsIPAddrs = []net.IP{{192, 168, 10, 1}} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/dnsforward_test.go |
assert.Nil(t, err) | <mask> s.conf.TCPListenAddr = &net.TCPAddr{Port: 0}
<mask> s.conf.UpstreamDNS = []string{"127.0.0.1:53"}
<mask> s.conf.FilteringConfig.ProtectionEnabled = true
<mask> err := s.Prepare(nil)
<mask> assert.True(t, err == nil)
<mask> assert.Nil(t, s.Start())
<mask>
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
<mask> req := createTestMessage("1.0.0.127.in-addr.arpa.")
<mask> req.Question[0].Qtype = dns.TypePTR
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove conf.BlockingIPv4 = "bad IP"
</s> add conf.BlockingIPv4 = nil </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.Equal(t, 1, len(resp.Answer))
</s> add assert.Len(t, resp.Answer, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/dnsforward_test.go |
assert.Len(t, resp.Answer, 1) | <mask> req.Question[0].Qtype = dns.TypePTR
<mask>
<mask> resp, err := dns.Exchange(req, addr.String())
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, 1, len(resp.Answer))
<mask> assert.Equal(t, dns.TypePTR, resp.Answer[0].Header().Rrtype)
<mask> assert.Equal(t, "1.0.0.127.in-addr.arpa.", resp.Answer[0].Header().Name)
<mask> ptr := resp.Answer[0].(*dns.PTR)
<mask> assert.Equal(t, "localhost.", ptr.Ptr)
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 1, len(resp.Answer))
</s> add assert.Len(t, resp.Answer, 1) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.Equal(t, 1, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 1) </s> remove assert.Equal(t, 1, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/dnsforward_test.go |
assert.Nil(t, err) | <mask> s.conf.TCPListenAddr = &net.TCPAddr{Port: 0}
<mask> s.conf.UpstreamDNS = []string{"127.0.0.1:53"}
<mask> s.conf.FilteringConfig.ProtectionEnabled = true
<mask> err := s.Prepare(nil)
<mask> assert.True(t, err == nil)
<mask> assert.Nil(t, s.Start())
<mask>
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
<mask> req := createTestMessage("1.0.0.127.in-addr.arpa.")
<mask> req.Question[0].Qtype = dns.TypePTR
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/dnsforward_test.go |
assert.Len(t, resp.Answer, 1) | <mask> req.Question[0].Qtype = dns.TypePTR
<mask>
<mask> resp, err := dns.Exchange(req, addr.String())
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, 1, len(resp.Answer))
<mask> assert.Equal(t, dns.TypePTR, resp.Answer[0].Header().Rrtype)
<mask> assert.Equal(t, "1.0.0.127.in-addr.arpa.", resp.Answer[0].Header().Name)
<mask> ptr := resp.Answer[0].(*dns.PTR)
<mask> assert.Equal(t, "host.", ptr.Ptr)
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.Equal(t, 1, len(resp.Answer))
</s> add assert.Len(t, resp.Answer, 1) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.Equal(t, 1, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 1) </s> remove assert.Equal(t, 1, len(reply.Answer))
</s> add assert.Len(t, reply.Answer, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/dnsforward_test.go |
ip := IPStringFromAddr(d.Addr) | <mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> func (s *Server) beforeRequestHandler(_ *proxy.Proxy, d *proxy.DNSContext) (bool, error) {
<mask> ip := ipFromAddr(d.Addr)
<mask> disallowed, _ := s.access.IsBlockedIP(ip)
<mask> if disallowed {
<mask> log.Tracef("Client IP %s is blocked by settings", ip)
<mask> return false, nil
<mask> }
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove clientAddr := ipFromAddr(d.Addr)
</s> add clientAddr := IPStringFromAddr(d.Addr) </s> remove func parseIPv4(text string) (net.IP, error) {
result := net.ParseIP(text)
if result == nil {
return nil, fmt.Errorf("%s is not an IP address", text)
</s> add func tryTo4(ip net.IP) (ip4 net.IP, err error) {
if ip == nil {
return nil, fmt.Errorf("%v is not an IP address", ip) </s> remove ip := dnsforward.GetIPString(d.Addr)
</s> add ip := dnsforward.IPStringFromAddr(d.Addr) </s> remove if result.To4() == nil {
return nil, fmt.Errorf("%s is not an IPv4 address", text)
</s> add ip4 = ip.To4()
if ip4 == nil {
return nil, fmt.Errorf("%v is not an IPv4 address", ip) </s> remove log.Debug("DNS: internal record: %s -> %s", req.Question[0].Name, ip.String())
</s> add log.Debug("DNS: internal record: %s -> %s", req.Question[0].Name, ip) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/filter.go |
clientAddr := IPStringFromAddr(d.Addr) | <mask> func (s *Server) getClientRequestFilteringSettings(d *proxy.DNSContext) *dnsfilter.RequestFilteringSettings {
<mask> setts := s.dnsFilter.GetConfig()
<mask> setts.FilteringEnabled = true
<mask> if s.conf.FilterHandler != nil {
<mask> clientAddr := ipFromAddr(d.Addr)
<mask> s.conf.FilterHandler(clientAddr, &setts)
<mask> }
<mask> return &setts
<mask> }
<mask>
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove ip := ipFromAddr(d.Addr)
</s> add ip := IPStringFromAddr(d.Addr) </s> remove ip := dnsforward.GetIPString(d.Addr)
</s> add ip := dnsforward.IPStringFromAddr(d.Addr) </s> remove clientIP := ipFromAddr(d.Addr)
</s> add clientIP := IPStringFromAddr(d.Addr) </s> remove ip := net.ParseIP(lj.IP)
if ip != nil && ip.To4() == nil {
mac, err := net.ParseMAC(lj.HWAddr)
</s> add if lj.IP == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
ip4 := lj.IP.To4()
mac, err := net.ParseMAC(lj.HWAddr)
lease := Lease{
HWAddr: mac,
}
if ip4 == nil {
lease.IP = lj.IP.To16()
</s> remove ip := net.ParseIP(lj.IP)
if ip != nil && ip.To4() == nil {
mac, err := net.ParseMAC(lj.HWAddr)
</s> add if lj.IP == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
ip4 := lj.IP.To4()
mac, err := net.ParseMAC(lj.HWAddr)
lease := Lease{
HWAddr: mac,
}
if ip4 == nil {
lease.IP = lj.IP.To16()
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/filter.go |
BlockingIPv4 net.IP `json:"blocking_ipv4"`
BlockingIPv6 net.IP `json:"blocking_ipv6"` | <mask>
<mask> ProtectionEnabled *bool `json:"protection_enabled"`
<mask> RateLimit *uint32 `json:"ratelimit"`
<mask> BlockingMode *string `json:"blocking_mode"`
<mask> BlockingIPv4 *string `json:"blocking_ipv4"`
<mask> BlockingIPv6 *string `json:"blocking_ipv6"`
<mask> EDNSCSEnabled *bool `json:"edns_cs_enabled"`
<mask> DNSSECEnabled *bool `json:"dnssec_enabled"`
<mask> DisableIPv6 *bool `json:"disable_ipv6"`
<mask> UpstreamMode *string `json:"upstream_mode"`
<mask> CacheSize *uint32 `json:"cache_size"`
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
BlockingMode string `yaml:"blocking_mode"` // mode how to answer filtered requests
BlockingIPv4 string `yaml:"blocking_ipv4"` // IP address to be returned for a blocked A request
BlockingIPv6 string `yaml:"blocking_ipv6"` // IP address to be returned for a blocked AAAA request
BlockingIPAddrv4 net.IP `yaml:"-"`
BlockingIPAddrv6 net.IP `yaml:"-"`
</s> add ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
BlockingMode string `yaml:"blocking_mode"` // mode how to answer filtered requests
BlockingIPv4 net.IP `yaml:"blocking_ipv4"` // IP address to be returned for a blocked A request
BlockingIPv6 net.IP `yaml:"blocking_ipv6"` // IP address to be returned for a blocked AAAA request </s> remove assert.True(t, err != nil) // invalid BlockingIPv4
</s> add assert.NotNil(t, err) // invalid BlockingIPv4 </s> remove conf.BlockingIPv4 = "bad IP"
</s> add conf.BlockingIPv4 = nil </s> remove conf.BlockingIPv4 = "0.0.0.1"
conf.BlockingIPv6 = "::1"
</s> add conf.BlockingIPv4 = net.IP{0, 0, 0, 1}
conf.BlockingIPv6 = net.ParseIP("::1") </s> remove assert.True(t, SplitNext(&s, ',') == "a")
assert.True(t, SplitNext(&s, ',') == "b")
assert.True(t, SplitNext(&s, ',') == "c" && len(s) == 0)
</s> add assert.Equal(t, "a", SplitNext(&s, ','))
assert.Equal(t, "b", SplitNext(&s, ','))
assert.Equal(t, "c", SplitNext(&s, ','))
assert.Empty(t, s) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/http.go |
BlockingIPv4: BlockingIPv4,
BlockingIPv6: BlockingIPv6, | <mask> UpstreamsFile: &upstreamFile,
<mask> Bootstraps: &bootstraps,
<mask> ProtectionEnabled: &protectionEnabled,
<mask> BlockingMode: &blockingMode,
<mask> BlockingIPv4: &BlockingIPv4,
<mask> BlockingIPv6: &BlockingIPv6,
<mask> RateLimit: &Ratelimit,
<mask> EDNSCSEnabled: &EnableEDNSClientSubnet,
<mask> DNSSECEnabled: &EnableDNSSEC,
<mask> DisableIPv6: &AAAADisabled,
<mask> CacheSize: &CacheSize,
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove assert.True(t, SplitNext(&s, ',') == "a")
assert.True(t, SplitNext(&s, ',') == "b")
assert.True(t, SplitNext(&s, ',') == "c" && len(s) == 0)
</s> add assert.Equal(t, "a", SplitNext(&s, ','))
assert.Equal(t, "b", SplitNext(&s, ','))
assert.Equal(t, "c", SplitNext(&s, ','))
assert.Empty(t, s) </s> remove assert.True(t, err == nil)
</s> add assert.Nil(t, err) </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove assert.True(t, s.AddStaticLease(l) == nil)
</s> add assert.Nil(t, s.AddStaticLease(l)) </s> remove assert.Equal(t, 2, len(ls))
</s> add assert.Len(t, ls, 2) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/http.go |
if req.BlockingIPv4.To4() == nil { | <mask> }
<mask>
<mask> bm := *req.BlockingMode
<mask> if bm == "custom_ip" {
<mask> if req.BlockingIPv4 == nil || req.BlockingIPv6 == nil {
<mask> return false
<mask> }
<mask>
<mask> ip4 := net.ParseIP(*req.BlockingIPv4)
<mask> if ip4 == nil || ip4.To4() == nil {
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove ip4 := net.ParseIP(*req.BlockingIPv4)
if ip4 == nil || ip4.To4() == nil {
return false
}
ip6 := net.ParseIP(*req.BlockingIPv6)
return ip6 != nil
</s> add return req.BlockingIPv6 != nil </s> remove s.conf.BlockingIPAddrv4 = net.ParseIP(s.conf.BlockingIPv4)
s.conf.BlockingIPAddrv6 = net.ParseIP(s.conf.BlockingIPv6)
if s.conf.BlockingIPAddrv4 == nil || s.conf.BlockingIPAddrv6 == nil {
</s> add if s.conf.BlockingIPv4 == nil || s.conf.BlockingIPv6 == nil { </s> remove ip := net.ParseIP(lj.IP)
if ip != nil && ip.To4() == nil {
mac, err := net.ParseMAC(lj.HWAddr)
</s> add if lj.IP == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
ip4 := lj.IP.To4()
mac, err := net.ParseMAC(lj.HWAddr)
lease := Lease{
HWAddr: mac,
}
if ip4 == nil {
lease.IP = lj.IP.To16()
</s> remove ip := net.ParseIP(lj.IP)
if ip != nil && ip.To4() == nil {
mac, err := net.ParseMAC(lj.HWAddr)
</s> add if lj.IP == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
ip4 := lj.IP.To4()
mac, err := net.ParseMAC(lj.HWAddr)
lease := Lease{
HWAddr: mac,
}
if ip4 == nil {
lease.IP = lj.IP.To16()
</s> remove if result.To4() == nil {
return nil, fmt.Errorf("%s is not an IPv4 address", text)
</s> add ip4 = ip.To4()
if ip4 == nil {
return nil, fmt.Errorf("%v is not an IPv4 address", ip) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/http.go |
return req.BlockingIPv6 != nil | <mask> if req.BlockingIPv4 == nil || req.BlockingIPv6 == nil {
<mask> return false
<mask> }
<mask>
<mask> ip4 := net.ParseIP(*req.BlockingIPv4)
<mask> if ip4 == nil || ip4.To4() == nil {
<mask> return false
<mask> }
<mask>
<mask> ip6 := net.ParseIP(*req.BlockingIPv6)
<mask> return ip6 != nil
<mask> }
<mask>
<mask> for _, valid := range []string{
<mask> "default",
<mask> "refused",
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove if req.BlockingIPv4 == nil || req.BlockingIPv6 == nil {
</s> add if req.BlockingIPv4.To4() == nil { </s> remove ip := net.ParseIP(lj.IP)
if ip != nil && ip.To4() == nil {
mac, err := net.ParseMAC(lj.HWAddr)
</s> add if lj.IP == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
ip4 := lj.IP.To4()
mac, err := net.ParseMAC(lj.HWAddr)
lease := Lease{
HWAddr: mac,
}
if ip4 == nil {
lease.IP = lj.IP.To16()
</s> remove ip := net.ParseIP(lj.IP)
if ip != nil && ip.To4() == nil {
mac, err := net.ParseMAC(lj.HWAddr)
</s> add if lj.IP == nil {
httpError(r, w, http.StatusBadRequest, "invalid IP")
return
}
ip4 := lj.IP.To4()
mac, err := net.ParseMAC(lj.HWAddr)
lease := Lease{
HWAddr: mac,
}
if ip4 == nil {
lease.IP = lj.IP.To16()
</s> remove ip := net.ParseIP(fields[2])
if ip == nil {
return ""
}
return fields[2]
</s> add return net.ParseIP(fields[2]) </s> remove if result.To4() == nil {
return nil, fmt.Errorf("%s is not an IPv4 address", text)
</s> add ip4 = ip.To4()
if ip4 == nil {
return nil, fmt.Errorf("%v is not an IPv4 address", ip) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/http.go |
s.conf.BlockingIPv4 = dc.BlockingIPv4.To4()
s.conf.BlockingIPv6 = dc.BlockingIPv6.To16() | <mask>
<mask> if dc.BlockingMode != nil {
<mask> s.conf.BlockingMode = *dc.BlockingMode
<mask> if *dc.BlockingMode == "custom_ip" {
<mask> s.conf.BlockingIPv4 = *dc.BlockingIPv4
<mask> s.conf.BlockingIPAddrv4 = net.ParseIP(*dc.BlockingIPv4)
<mask> s.conf.BlockingIPv6 = *dc.BlockingIPv6
<mask> s.conf.BlockingIPAddrv6 = net.ParseIP(*dc.BlockingIPv6)
<mask> }
<mask> }
<mask>
<mask> if dc.RateLimit != nil {
<mask> if s.conf.Ratelimit != *dc.RateLimit {
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove s.conf.BlockingIPAddrv4 = net.ParseIP(s.conf.BlockingIPv4)
s.conf.BlockingIPAddrv6 = net.ParseIP(s.conf.BlockingIPv6)
if s.conf.BlockingIPAddrv4 == nil || s.conf.BlockingIPAddrv6 == nil {
</s> add if s.conf.BlockingIPv4 == nil || s.conf.BlockingIPv6 == nil { </s> remove jsonIface.Addrs4 = append(jsonIface.Addrs4, ipnet.IP.String())
</s> add jsonIface.Addrs4 = append(jsonIface.Addrs4, ipnet.IP) </s> remove jsonIface.Addrs6 = append(jsonIface.Addrs6, ipnet.IP.String())
</s> add jsonIface.Addrs6 = append(jsonIface.Addrs6, ipnet.IP) </s> remove if len(gatewayIP) != 0 {
</s> add if gatewayIP != nil { </s> remove return
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/http.go |
return s.genARecord(m, s.conf.BlockingIPv4) | <mask> // means that we should return custom IP for any blocked request
<mask>
<mask> switch m.Question[0].Qtype {
<mask> case dns.TypeA:
<mask> return s.genARecord(m, s.conf.BlockingIPAddrv4)
<mask> case dns.TypeAAAA:
<mask> return s.genAAAARecord(m, s.conf.BlockingIPAddrv6)
<mask> }
<mask> } else if s.conf.BlockingMode == "nxdomain" {
<mask> // means that we should return NXDOMAIN for any blocked request
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove return s.genAAAARecord(m, s.conf.BlockingIPAddrv6)
</s> add return s.genAAAARecord(m, s.conf.BlockingIPv6) </s> remove return addr.IP.String()
</s> add return addr.IP </s> remove ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
BlockingMode string `yaml:"blocking_mode"` // mode how to answer filtered requests
BlockingIPv4 string `yaml:"blocking_ipv4"` // IP address to be returned for a blocked A request
BlockingIPv6 string `yaml:"blocking_ipv6"` // IP address to be returned for a blocked AAAA request
BlockingIPAddrv4 net.IP `yaml:"-"`
BlockingIPAddrv6 net.IP `yaml:"-"`
</s> add ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
BlockingMode string `yaml:"blocking_mode"` // mode how to answer filtered requests
BlockingIPv4 net.IP `yaml:"blocking_ipv4"` // IP address to be returned for a blocked A request
BlockingIPv6 net.IP `yaml:"blocking_ipv6"` // IP address to be returned for a blocked AAAA request </s> remove func ipFromAddr(a net.Addr) string {
switch addr := a.(type) {
case *net.UDPAddr:
return addr.IP.String()
case *net.TCPAddr:
return addr.IP.String()
</s> add func IPStringFromAddr(addr net.Addr) (ipstr string) {
if ip := ipFromAddr(addr); ip != nil {
return ip.String() </s> remove return addr.IP.String()
</s> add return addr.IP | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/msg.go |
return s.genAAAARecord(m, s.conf.BlockingIPv6) | <mask> switch m.Question[0].Qtype {
<mask> case dns.TypeA:
<mask> return s.genARecord(m, s.conf.BlockingIPAddrv4)
<mask> case dns.TypeAAAA:
<mask> return s.genAAAARecord(m, s.conf.BlockingIPAddrv6)
<mask> }
<mask> } else if s.conf.BlockingMode == "nxdomain" {
<mask> // means that we should return NXDOMAIN for any blocked request
<mask>
<mask> return s.genNXDomain(m)
</s> Pull request: 2508 ip conversion vol.1
Merge in DNS/adguard-home from 2508-ip-conversion to master
Updates #2508.
Squashed commit of the following:
commit 3f64709fbc73ef74c11b910997be1e9bc337193c
Merge: 5ac7faaaa 0d67aa251
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 16:21:34 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit 5ac7faaaa9dda570fdb872acad5d13d078f46b64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 12:00:11 2021 +0300
all: replace conditions with appropriate functions in tests
commit 9e3fa9a115ed23024c57dd5192d5173477ddbf71
Merge: db992a42a bba74859e
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Jan 13 10:47:10 2021 +0300
Merge branch 'master' into 2508-ip-conversion
commit db992a42a2c6f315421e78a6a0492e2bfb3ce89d
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:55:53 2021 +0300
sysutil: fix linux tests
commit f629b15d62349323ce2da05e68dc9cc0b5f6e194
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 18:41:20 2021 +0300
all: improve code quality
commit 3bf03a75524040738562298bd1de6db536af130f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 17:33:26 2021 +0300
sysutil: fix linux net.IP conversion
commit 5d5b6994916923636e635588631b63b7e7b74e5f
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Jan 12 14:57:26 2021 +0300
dnsforward: remove redundant net.IP <-> string conversion
commit 0b955d99b7fad40942f21d1dd8734adb99126195
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Mon Jan 11 18:04:25 2021 +0300
dhcpd: remove net.IP <-> string conversion </s> remove return s.genARecord(m, s.conf.BlockingIPAddrv4)
</s> add return s.genARecord(m, s.conf.BlockingIPv4) </s> remove return addr.IP.String()
</s> add return addr.IP </s> remove return addr.IP.String()
</s> add return addr.IP </s> remove func ipFromAddr(a net.Addr) string {
switch addr := a.(type) {
case *net.UDPAddr:
return addr.IP.String()
case *net.TCPAddr:
return addr.IP.String()
</s> add func IPStringFromAddr(addr net.Addr) (ipstr string) {
if ip := ipFromAddr(addr); ip != nil {
return ip.String() </s> remove // Get IP address from net.Addr
func getIP(addr net.Addr) net.IP {
switch addr := addr.(type) {
case *net.UDPAddr:
return addr.IP
case *net.TCPAddr:
return addr.IP
}
return nil
</s> add func stringArrayDup(a []string) []string {
a2 := make([]string, len(a))
copy(a2, a)
return a2 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/e8c1f5c8d3d511340662a406b238267fdb815248 | internal/dnsforward/msg.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.