docstring_tokens
stringlengths 0
76.5k
| code_tokens
stringlengths 75
1.81M
| label_window
sequencelengths 4
2.12k
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|---|
<mask> )
<mask>
<mask> const (
<mask> tlsServerName = "testdns.adguard.com"
<mask> dataDir = "testData"
<mask> testMessagesCount = 10
<mask> )
<mask>
<mask> func TestServer(t *testing.T) {
<mask> s := createTestServer(t)
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear </s> remove "github.com/stretchr/testify/assert"
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove s := NewServer(createDataDir(t), nil)
</s> add s := NewServer(nil, nil) </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | dnsforward/dnsforward_test.go |
|
<mask> )
<mask>
<mask> func TestServer(t *testing.T) {
<mask> s := createTestServer(t)
<mask> defer removeDataDir(t)
<mask> err := s.Start(nil)
<mask> if err != nil {
<mask> t.Fatalf("Failed to start server: %s", err)
<mask> }
<mask>
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | dnsforward/dnsforward_test.go |
|
<mask> t.Fatalf("Couldn't talk to server %s: %s", addr, err)
<mask> }
<mask> assertGoogleAResponse(t, reply)
<mask>
<mask> // check query log and stats
<mask> log := s.GetQueryLog()
<mask> assert.Equal(t, 1, len(log), "Log size")
<mask>
<mask> // message over TCP
<mask> req = createGoogleATestMessage()
<mask> addr = s.dnsProxy.Addr("tcp")
<mask> client = dns.Client{Net: "tcp"}
<mask> reply, _, err = client.Exchange(req, addr.String())
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear </s> remove // check query log and stats
log := s.GetQueryLog()
assert.Equal(t, 1, len(log), "Log size")
</s> add </s> remove // check query log and stats again
log = s.GetQueryLog()
assert.Equal(t, 2, len(log), "Log size")
</s> add </s> remove // check query log and stats
log := s.GetQueryLog()
assert.Equal(t, 1, len(log), "Log size")
</s> add </s> remove // check query log and stats
log := s.GetQueryLog()
assert.Equal(t, 1, len(log), "Log size")
</s> add </s> remove // check query log and stats
log := s.GetQueryLog()
assert.Equal(t, 1, len(log), "Log size")
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | dnsforward/dnsforward_test.go |
|
<mask> t.Fatalf("Couldn't talk to server %s: %s", addr, err)
<mask> }
<mask> assertGoogleAResponse(t, reply)
<mask>
<mask> // check query log and stats again
<mask> log = s.GetQueryLog()
<mask> assert.Equal(t, 2, len(log), "Log size")
<mask>
<mask> err = s.Stop()
<mask> if err != nil {
<mask> t.Fatalf("DNS server failed to stop: %s", err)
<mask> }
<mask> }
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear </s> remove // check query log and stats
log := s.GetQueryLog()
assert.Equal(t, 1, len(log), "Log size")
</s> add </s> remove // check query log and stats
log := s.GetQueryLog()
assert.Equal(t, 1, len(log), "Log size")
</s> add </s> remove // check query log and stats
log := s.GetQueryLog()
assert.Equal(t, 1, len(log), "Log size")
</s> add </s> remove // check query log and stats
log := s.GetQueryLog()
assert.Equal(t, 1, len(log), "Log size")
</s> add </s> remove // check query log and stats
log := s.GetQueryLog()
assert.Equal(t, 1, len(log), "Log size")
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | dnsforward/dnsforward_test.go |
|
<mask>
<mask> func TestServerWithProtectionDisabled(t *testing.T) {
<mask> s := createTestServer(t)
<mask> s.conf.ProtectionEnabled = false
<mask> defer removeDataDir(t)
<mask> err := s.Start(nil)
<mask> if err != nil {
<mask> t.Fatalf("Failed to start server: %s", err)
<mask> }
<mask>
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | dnsforward/dnsforward_test.go |
|
<mask> t.Fatalf("Couldn't talk to server %s: %s", addr, err)
<mask> }
<mask> assertGoogleAResponse(t, reply)
<mask>
<mask> // check query log and stats
<mask> log := s.GetQueryLog()
<mask> assert.Equal(t, 1, len(log), "Log size")
<mask>
<mask> err = s.Stop()
<mask> if err != nil {
<mask> t.Fatalf("DNS server failed to stop: %s", err)
<mask> }
<mask> }
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear </s> remove // check query log and stats again
log = s.GetQueryLog()
assert.Equal(t, 2, len(log), "Log size")
</s> add </s> remove // check query log and stats
log := s.GetQueryLog()
assert.Equal(t, 1, len(log), "Log size")
</s> add </s> remove // check query log and stats
log := s.GetQueryLog()
assert.Equal(t, 1, len(log), "Log size")
</s> add </s> remove // check query log and stats
log := s.GetQueryLog()
assert.Equal(t, 1, len(log), "Log size")
</s> add </s> remove // check query log and stats
log := s.GetQueryLog()
assert.Equal(t, 1, len(log), "Log size")
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | dnsforward/dnsforward_test.go |
|
<mask> func TestDotServer(t *testing.T) {
<mask> // Prepare the proxy server
<mask> _, certPem, keyPem := createServerTLSConfig(t)
<mask> s := createTestServer(t)
<mask> defer removeDataDir(t)
<mask>
<mask> s.conf.TLSConfig = TLSConfig{
<mask> TLSListenAddr: &net.TCPAddr{Port: 0},
<mask> CertificateChainData: certPem,
<mask> PrivateKeyData: keyPem,
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear </s> remove func createDataDir(t *testing.T) string {
err := os.MkdirAll(dataDir, 0755)
if err != nil {
t.Fatalf("Cannot create %s: %s", dataDir, err)
}
return dataDir
}
func removeDataDir(t *testing.T) {
err := os.RemoveAll(dataDir)
if err != nil {
t.Fatalf("Cannot remove %s: %s", dataDir, err)
}
}
</s> add </s> remove s := NewServer(createDataDir(t), nil)
</s> add s := NewServer(nil, nil) </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | dnsforward/dnsforward_test.go |
|
<mask> }
<mask>
<mask> func TestServerRace(t *testing.T) {
<mask> s := createTestServer(t)
<mask> defer removeDataDir(t)
<mask> err := s.Start(nil)
<mask> if err != nil {
<mask> t.Fatalf("Failed to start server: %s", err)
<mask> }
<mask>
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | dnsforward/dnsforward_test.go |
|
<mask>
<mask> func TestSafeSearch(t *testing.T) {
<mask> s := createTestServer(t)
<mask> s.conf.SafeSearchEnabled = true
<mask> defer removeDataDir(t)
<mask> err := s.Start(nil)
<mask> if err != nil {
<mask> t.Fatalf("Failed to start server: %s", err)
<mask> }
<mask>
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | dnsforward/dnsforward_test.go |
|
<mask> }
<mask>
<mask> func TestInvalidRequest(t *testing.T) {
<mask> s := createTestServer(t)
<mask> defer removeDataDir(t)
<mask> err := s.Start(nil)
<mask> if err != nil {
<mask> t.Fatalf("Failed to start server: %s", err)
<mask> }
<mask>
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | dnsforward/dnsforward_test.go |
|
<mask> if err != nil {
<mask> t.Fatalf("got a response to an invalid query")
<mask> }
<mask>
<mask> // check query log and stats
<mask> // invalid requests aren't written to the query log
<mask> log := s.GetQueryLog()
<mask> assert.Equal(t, 0, len(log), "Log size")
<mask>
<mask> err = s.Stop()
<mask> if err != nil {
<mask> t.Fatalf("DNS server failed to stop: %s", err)
<mask> }
<mask> }
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear </s> remove // check query log and stats
log := s.GetQueryLog()
assert.Equal(t, 1, len(log), "Log size")
</s> add </s> remove // check query log and stats
log := s.GetQueryLog()
assert.Equal(t, 1, len(log), "Log size")
</s> add </s> remove // check query log and stats again
log = s.GetQueryLog()
assert.Equal(t, 2, len(log), "Log size")
</s> add </s> remove // check query log and stats
log := s.GetQueryLog()
assert.Equal(t, 1, len(log), "Log size")
</s> add </s> remove // check query log and stats
log := s.GetQueryLog()
assert.Equal(t, 1, len(log), "Log size")
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | dnsforward/dnsforward_test.go |
|
<mask> }
<mask>
<mask> func TestBlockedRequest(t *testing.T) {
<mask> s := createTestServer(t)
<mask> defer removeDataDir(t)
<mask> err := s.Start(nil)
<mask> if err != nil {
<mask> t.Fatalf("Failed to start server: %s", err)
<mask> }
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | dnsforward/dnsforward_test.go |
|
<mask> if reply.Rcode != dns.RcodeNameError {
<mask> t.Fatalf("Wrong response: %s", reply.String())
<mask> }
<mask>
<mask> // check query log and stats
<mask> log := s.GetQueryLog()
<mask> assert.Equal(t, 1, len(log), "Log size")
<mask>
<mask> err = s.Stop()
<mask> if err != nil {
<mask> t.Fatalf("DNS server failed to stop: %s", err)
<mask> }
<mask> }
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear </s> remove // check query log and stats
log := s.GetQueryLog()
assert.Equal(t, 1, len(log), "Log size")
</s> add </s> remove // check query log and stats
log := s.GetQueryLog()
assert.Equal(t, 1, len(log), "Log size")
</s> add </s> remove // check query log and stats
log := s.GetQueryLog()
assert.Equal(t, 1, len(log), "Log size")
</s> add </s> remove // check query log and stats
log := s.GetQueryLog()
assert.Equal(t, 1, len(log), "Log size")
</s> add </s> remove // check query log and stats
// invalid requests aren't written to the query log
log := s.GetQueryLog()
assert.Equal(t, 0, len(log), "Log size")
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | dnsforward/dnsforward_test.go |
|
<mask>
<mask> func TestNullBlockedRequest(t *testing.T) {
<mask> s := createTestServer(t)
<mask> s.conf.FilteringConfig.BlockingMode = "null_ip"
<mask> defer removeDataDir(t)
<mask> err := s.Start(nil)
<mask> if err != nil {
<mask> t.Fatalf("Failed to start server: %s", err)
<mask> }
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | dnsforward/dnsforward_test.go |
|
<mask> } else {
<mask> t.Fatalf("DNS server %s returned wrong answer type instead of A: %v", addr, reply.Answer[0])
<mask> }
<mask>
<mask> // check query log and stats
<mask> log := s.GetQueryLog()
<mask> assert.Equal(t, 1, len(log), "Log size")
<mask>
<mask> err = s.Stop()
<mask> if err != nil {
<mask> t.Fatalf("DNS server failed to stop: %s", err)
<mask> }
<mask> }
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear </s> remove // check query log and stats
log := s.GetQueryLog()
assert.Equal(t, 1, len(log), "Log size")
</s> add </s> remove // check query log and stats
log := s.GetQueryLog()
assert.Equal(t, 1, len(log), "Log size")
</s> add </s> remove // check query log and stats
log := s.GetQueryLog()
assert.Equal(t, 1, len(log), "Log size")
</s> add </s> remove // check query log and stats
log := s.GetQueryLog()
assert.Equal(t, 1, len(log), "Log size")
</s> add </s> remove // check query log and stats again
log = s.GetQueryLog()
assert.Equal(t, 2, len(log), "Log size")
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | dnsforward/dnsforward_test.go |
|
<mask> }
<mask>
<mask> func TestBlockedByHosts(t *testing.T) {
<mask> s := createTestServer(t)
<mask> defer removeDataDir(t)
<mask> err := s.Start(nil)
<mask> if err != nil {
<mask> t.Fatalf("Failed to start server: %s", err)
<mask> }
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | dnsforward/dnsforward_test.go |
|
<mask> } else {
<mask> t.Fatalf("DNS server %s returned wrong answer type instead of A: %v", addr, reply.Answer[0])
<mask> }
<mask>
<mask> // check query log and stats
<mask> log := s.GetQueryLog()
<mask> assert.Equal(t, 1, len(log), "Log size")
<mask>
<mask> err = s.Stop()
<mask> if err != nil {
<mask> t.Fatalf("DNS server failed to stop: %s", err)
<mask> }
<mask> }
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | dnsforward/dnsforward_test.go |
|
<mask> }
<mask>
<mask> func TestBlockedBySafeBrowsing(t *testing.T) {
<mask> s := createTestServer(t)
<mask> defer removeDataDir(t)
<mask> err := s.Start(nil)
<mask> if err != nil {
<mask> t.Fatalf("Failed to start server: %s", err)
<mask> }
<mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | dnsforward/dnsforward_test.go |
|
<mask> } else {
<mask> t.Fatalf("DNS server %s returned wrong answer type instead of A: %v", addr, reply.Answer[0])
<mask> }
<mask>
<mask> // check query log and stats
<mask> log := s.GetQueryLog()
<mask> assert.Equal(t, 1, len(log), "Log size")
<mask>
<mask> err = s.Stop()
<mask> if err != nil {
<mask> t.Fatalf("DNS server failed to stop: %s", err)
<mask> }
<mask> }
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | dnsforward/dnsforward_test.go |
|
s := NewServer(nil, nil) | <mask> }
<mask> }
<mask>
<mask> func createTestServer(t *testing.T) *Server {
<mask> s := NewServer(createDataDir(t), nil)
<mask> s.conf.UDPListenAddr = &net.UDPAddr{Port: 0}
<mask> s.conf.TCPListenAddr = &net.TCPAddr{Port: 0}
<mask>
<mask> s.conf.QueryLogEnabled = true
<mask> s.conf.FilteringConfig.FilteringEnabled = true
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear </s> remove defer removeDataDir(t)
</s> add </s> remove if s.conf.QueryLogEnabled && shouldLog {
</s> add if s.conf.QueryLogEnabled && shouldLog && s.queryLog != nil { </s> remove config.dnsServer = dnsforward.NewServer(baseDir, config.stats)
</s> add conf := querylog.Config{
BaseDir: baseDir,
Interval: config.DNS.QueryLogInterval * 24,
}
config.queryLog = querylog.New(conf)
config.dnsServer = dnsforward.NewServer(config.stats, config.queryLog) </s> remove // flush remainder to file
return s.queryLog.flushLogBuffer(true)
</s> add return nil </s> remove // -----
// stats
// -----
func handleQueryLogEnable(w http.ResponseWriter, r *http.Request) {
config.DNS.QueryLogEnabled = true
httpUpdateConfigReloadDNSReturnOK(w, r)
}
func handleQueryLogDisable(w http.ResponseWriter, r *http.Request) {
config.DNS.QueryLogEnabled = false
httpUpdateConfigReloadDNSReturnOK(w, r)
}
func handleQueryLog(w http.ResponseWriter, r *http.Request) {
data := config.dnsServer.GetQueryLog()
jsonVal, err := json.Marshal(data)
if err != nil {
httpError(w, http.StatusInternalServerError, "Couldn't marshal data into json: %s", err)
return
}
w.Header().Set("Content-Type", "application/json")
_, err = w.Write(jsonVal)
if err != nil {
httpError(w, http.StatusInternalServerError, "Unable to write response json: %s", err)
}
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | dnsforward/dnsforward_test.go |
<mask>
<mask> return &tls.Config{Certificates: []tls.Certificate{cert}, ServerName: tlsServerName, MinVersion: tls.VersionTLS12}, certPem, keyPem
<mask> }
<mask>
<mask> func createDataDir(t *testing.T) string {
<mask> err := os.MkdirAll(dataDir, 0755)
<mask> if err != nil {
<mask> t.Fatalf("Cannot create %s: %s", dataDir, err)
<mask> }
<mask> return dataDir
<mask> }
<mask>
<mask> func removeDataDir(t *testing.T) {
<mask> err := os.RemoveAll(dataDir)
<mask> if err != nil {
<mask> t.Fatalf("Cannot remove %s: %s", dataDir, err)
<mask> }
<mask> }
<mask>
<mask> func sendTestMessageAsync(t *testing.T, conn *dns.Conn, g *sync.WaitGroup) {
<mask> defer func() {
<mask> g.Done()
<mask> }()
<mask>
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | dnsforward/dnsforward_test.go |
|
<mask> s := createTestServer(t)
<mask> s.conf.AllowedClients = []string{"1.1.1.1", "2.2.0.0/16"}
<mask>
<mask> err := s.Start(nil)
<mask> defer removeDataDir(t)
<mask> if err != nil {
<mask> t.Fatalf("Failed to start server: %s", err)
<mask> }
<mask>
<mask> if s.isBlockedIP("1.1.1.1") {
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | dnsforward/dnsforward_test.go |
|
<mask> s := createTestServer(t)
<mask> s.conf.DisallowedClients = []string{"1.1.1.1", "2.2.0.0/16"}
<mask>
<mask> err := s.Start(nil)
<mask> defer removeDataDir(t)
<mask> if err != nil {
<mask> t.Fatalf("Failed to start server: %s", err)
<mask> }
<mask>
<mask> if !s.isBlockedIP("1.1.1.1") {
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | dnsforward/dnsforward_test.go |
|
<mask> s := createTestServer(t)
<mask> s.conf.BlockedHosts = []string{"host1", "host2"}
<mask>
<mask> err := s.Start(nil)
<mask> defer removeDataDir(t)
<mask> if err != nil {
<mask> t.Fatalf("Failed to start server: %s", err)
<mask> }
<mask>
<mask> if !s.isBlockedDomain("host1") {
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | dnsforward/dnsforward_test.go |
|
"github.com/AdguardTeam/AdGuardHome/querylog" | <mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dhcpd"
<mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/stats"
<mask> "github.com/AdguardTeam/golibs/file"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> yaml "gopkg.in/yaml.v2"
<mask> )
<mask>
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear </s> remove "github.com/stretchr/testify/assert"
</s> add </s> remove dataDir = "testData"
</s> add </s> remove "os"
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | home/config.go |
queryLog querylog.QueryLog | <mask> client *http.Client
<mask> stats stats.Stats
<mask>
<mask> // cached version.json to avoid hammering github.io for each page reload
<mask> versionCheckJSON []byte
<mask> versionCheckLastTime time.Time
<mask>
<mask> dnsctx dnsContext
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear </s> remove queryLog *queryLog // Query log instance
</s> add queryLog querylog.QueryLog // Query log instance </s> remove // check query log and stats
log := s.GetQueryLog()
assert.Equal(t, 1, len(log), "Log size")
</s> add </s> remove // GetQueryLog returns a map with the current query log ready to be converted to a JSON
func (s *Server) GetQueryLog() []map[string]interface{} {
s.RLock()
defer s.RUnlock()
return s.queryLog.getQueryLog()
}
</s> add </s> remove // baseDir is the base directory for query logs
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | home/config.go |
QueryLogInterval: 1, | <mask> BlockingMode: "nxdomain", // mode how to answer filtered requests
<mask> BlockedResponseTTL: 10, // in seconds
<mask> QueryLogEnabled: true,
<mask> Ratelimit: 20,
<mask> RefuseAny: true,
<mask> BootstrapDNS: defaultBootstrap,
<mask> AllServers: false,
<mask> },
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear </s> remove // check query log and stats
// invalid requests aren't written to the query log
log := s.GetQueryLog()
assert.Equal(t, 0, len(log), "Log size")
</s> add </s> remove // check query log and stats
log := s.GetQueryLog()
assert.Equal(t, 1, len(log), "Log size")
</s> add </s> remove // check query log and stats
log := s.GetQueryLog()
assert.Equal(t, 1, len(log), "Log size")
</s> add </s> remove // check query log and stats
log := s.GetQueryLog()
assert.Equal(t, 1, len(log), "Log size")
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | home/config.go |
if !checkQueryLogInterval(config.DNS.QueryLogInterval) {
config.DNS.QueryLogInterval = 1
}
| <mask> config.DNS.StatsInterval = 1
<mask> }
<mask>
<mask> for _, cy := range config.Clients {
<mask> cli := Client{
<mask> Name: cy.Name,
<mask> IP: cy.IP,
<mask> MAC: cy.MAC,
<mask> UseOwnSettings: !cy.UseGlobalSettings,
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear </s> remove defer removeDataDir(t)
</s> add </s> remove s := NewServer(createDataDir(t), nil)
</s> add s := NewServer(nil, nil) </s> remove // -----
// stats
// -----
func handleQueryLogEnable(w http.ResponseWriter, r *http.Request) {
config.DNS.QueryLogEnabled = true
httpUpdateConfigReloadDNSReturnOK(w, r)
}
func handleQueryLogDisable(w http.ResponseWriter, r *http.Request) {
config.DNS.QueryLogEnabled = false
httpUpdateConfigReloadDNSReturnOK(w, r)
}
func handleQueryLog(w http.ResponseWriter, r *http.Request) {
data := config.dnsServer.GetQueryLog()
jsonVal, err := json.Marshal(data)
if err != nil {
httpError(w, http.StatusInternalServerError, "Couldn't marshal data into json: %s", err)
return
}
w.Header().Set("Content-Type", "application/json")
_, err = w.Write(jsonVal)
if err != nil {
httpError(w, http.StatusInternalServerError, "Unable to write response json: %s", err)
}
}
</s> add </s> remove if s.conf.QueryLogEnabled && shouldLog {
</s> add if s.conf.QueryLogEnabled && shouldLog && s.queryLog != nil { </s> remove defer removeDataDir(t)
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | home/config.go |
<mask> config.DNS.ProtectionEnabled = false
<mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> }
<mask>
<mask> // -----
<mask> // stats
<mask> // -----
<mask> func handleQueryLogEnable(w http.ResponseWriter, r *http.Request) {
<mask> config.DNS.QueryLogEnabled = true
<mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> }
<mask>
<mask> func handleQueryLogDisable(w http.ResponseWriter, r *http.Request) {
<mask> config.DNS.QueryLogEnabled = false
<mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> }
<mask>
<mask> func handleQueryLog(w http.ResponseWriter, r *http.Request) {
<mask> data := config.dnsServer.GetQueryLog()
<mask>
<mask> jsonVal, err := json.Marshal(data)
<mask> if err != nil {
<mask> httpError(w, http.StatusInternalServerError, "Couldn't marshal data into json: %s", err)
<mask> return
<mask> }
<mask>
<mask> w.Header().Set("Content-Type", "application/json")
<mask> _, err = w.Write(jsonVal)
<mask> if err != nil {
<mask> httpError(w, http.StatusInternalServerError, "Unable to write response json: %s", err)
<mask> }
<mask> }
<mask>
<mask> // -----------------------
<mask> // upstreams configuration
<mask> // -----------------------
<mask>
<mask> // TODO this struct will become unnecessary after config file rework
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear </s> remove // GetQueryLog returns a map with the current query log ready to be converted to a JSON
func (s *Server) GetQueryLog() []map[string]interface{} {
s.RLock()
defer s.RUnlock()
return s.queryLog.getQueryLog()
}
</s> add </s> remove if s.conf.QueryLogEnabled && shouldLog {
</s> add if s.conf.QueryLogEnabled && shouldLog && s.queryLog != nil { </s> remove // flush remainder to file
return s.queryLog.flushLogBuffer(true)
</s> add return nil </s> remove defer removeDataDir(t)
</s> add </s> remove // check query log and stats
// invalid requests aren't written to the query log
log := s.GetQueryLog()
assert.Equal(t, 0, len(log), "Log size")
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | home/control.go |
|
<mask> func registerControlHandlers() {
<mask> httpRegister(http.MethodGet, "/control/status", handleStatus)
<mask> httpRegister(http.MethodPost, "/control/enable_protection", handleProtectionEnable)
<mask> httpRegister(http.MethodPost, "/control/disable_protection", handleProtectionDisable)
<mask> httpRegister(http.MethodGet, "/control/querylog", handleQueryLog)
<mask> httpRegister(http.MethodPost, "/control/querylog_enable", handleQueryLogEnable)
<mask> httpRegister(http.MethodPost, "/control/querylog_disable", handleQueryLogDisable)
<mask> httpRegister(http.MethodPost, "/control/set_upstreams_config", handleSetUpstreamConfig)
<mask> httpRegister(http.MethodPost, "/control/test_upstream_dns", handleTestUpstreamDNS)
<mask> httpRegister(http.MethodPost, "/control/i18n/change_language", handleI18nChangeLanguage)
<mask> httpRegister(http.MethodGet, "/control/i18n/current_language", handleI18nCurrentLanguage)
<mask> http.HandleFunc("/control/version.json", postInstall(optionalAuth(handleGetVersionJSON)))
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear </s> remove func createDataDir(t *testing.T) string {
err := os.MkdirAll(dataDir, 0755)
if err != nil {
t.Fatalf("Cannot create %s: %s", dataDir, err)
}
return dataDir
}
func removeDataDir(t *testing.T) {
err := os.RemoveAll(dataDir)
if err != nil {
t.Fatalf("Cannot remove %s: %s", dataDir, err)
}
}
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove defer removeDataDir(t)
</s> add </s> remove // GetQueryLog returns a map with the current query log ready to be converted to a JSON
func (s *Server) GetQueryLog() []map[string]interface{} {
s.RLock()
defer s.RUnlock()
return s.queryLog.getQueryLog()
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | home/control.go |
|
RegisterQueryLogHandlers() | <mask> RegisterClientsHandlers()
<mask> registerRewritesHandlers()
<mask> RegisterBlockedServicesHandlers()
<mask> RegisterStatsHandlers()
<mask>
<mask> http.HandleFunc("/dns-query", postInstall(handleDOH))
<mask> }
<mask>
<mask> type httpHandlerType func(http.ResponseWriter, *http.Request)
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear </s> remove // -----
// stats
// -----
func handleQueryLogEnable(w http.ResponseWriter, r *http.Request) {
config.DNS.QueryLogEnabled = true
httpUpdateConfigReloadDNSReturnOK(w, r)
}
func handleQueryLogDisable(w http.ResponseWriter, r *http.Request) {
config.DNS.QueryLogEnabled = false
httpUpdateConfigReloadDNSReturnOK(w, r)
}
func handleQueryLog(w http.ResponseWriter, r *http.Request) {
data := config.dnsServer.GetQueryLog()
jsonVal, err := json.Marshal(data)
if err != nil {
httpError(w, http.StatusInternalServerError, "Couldn't marshal data into json: %s", err)
return
}
w.Header().Set("Content-Type", "application/json")
_, err = w.Write(jsonVal)
if err != nil {
httpError(w, http.StatusInternalServerError, "Unable to write response json: %s", err)
}
}
</s> add </s> remove // check query log and stats
log := s.GetQueryLog()
assert.Equal(t, 1, len(log), "Log size")
</s> add </s> remove // check query log and stats
log := s.GetQueryLog()
assert.Equal(t, 1, len(log), "Log size")
</s> add </s> remove // check query log and stats
log := s.GetQueryLog()
assert.Equal(t, 1, len(log), "Log size")
</s> add </s> remove queryLog *queryLog // Query log instance
</s> add queryLog querylog.QueryLog // Query log instance | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | home/control.go |
"github.com/AdguardTeam/AdGuardHome/querylog" | <mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/stats"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/joomcode/errorx"
<mask> "github.com/miekg/dns"
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear </s> remove "github.com/stretchr/testify/assert"
</s> add </s> remove "os"
</s> add </s> remove defer removeDataDir(t)
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | home/dns.go |
conf := querylog.Config{
BaseDir: baseDir,
Interval: config.DNS.QueryLogInterval * 24,
}
config.queryLog = querylog.New(conf)
config.dnsServer = dnsforward.NewServer(config.stats, config.queryLog) | <mask> config.stats, err = stats.New(statsDBFilename, config.DNS.StatsInterval, nil)
<mask> if err != nil {
<mask> log.Fatal("Couldn't initialize statistics module")
<mask> }
<mask> config.dnsServer = dnsforward.NewServer(baseDir, config.stats)
<mask>
<mask> initRDNS()
<mask> }
<mask>
<mask> func isRunning() bool {
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear </s> remove s := NewServer(createDataDir(t), nil)
</s> add s := NewServer(nil, nil) </s> remove if s.conf.QueryLogEnabled && shouldLog {
</s> add if s.conf.QueryLogEnabled && shouldLog && s.queryLog != nil { </s> remove // flush remainder to file
return s.queryLog.flushLogBuffer(true)
</s> add return nil </s> remove // -----
// stats
// -----
func handleQueryLogEnable(w http.ResponseWriter, r *http.Request) {
config.DNS.QueryLogEnabled = true
httpUpdateConfigReloadDNSReturnOK(w, r)
}
func handleQueryLogDisable(w http.ResponseWriter, r *http.Request) {
config.DNS.QueryLogEnabled = false
httpUpdateConfigReloadDNSReturnOK(w, r)
}
func handleQueryLog(w http.ResponseWriter, r *http.Request) {
data := config.dnsServer.GetQueryLog()
jsonVal, err := json.Marshal(data)
if err != nil {
httpError(w, http.StatusInternalServerError, "Couldn't marshal data into json: %s", err)
return
}
w.Header().Set("Content-Type", "application/json")
_, err = w.Write(jsonVal)
if err != nil {
httpError(w, http.StatusInternalServerError, "Unable to write response json: %s", err)
}
}
</s> add </s> remove _ = s.queryLog.logRequest(msg, d.Res, res, elapsed, d.Addr, upstreamAddr)
</s> add s.queryLog.Add(msg, d.Res, res, elapsed, d.Addr, upstreamAddr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | home/dns.go |
config.queryLog.Close() | <mask>
<mask> config.stats.Close()
<mask>
<mask> return nil
<mask> }
</s> * querylog: move code to a separate package
+ config: "querylog_interval" setting
/control/querylog_config, /control/querylog_info
+ POST /control/querylog_clear </s> remove // flush remainder to file
return s.queryLog.flushLogBuffer(true)
</s> add return nil </s> remove _ = s.queryLog.logRequest(msg, d.Res, res, elapsed, d.Addr, upstreamAddr)
</s> add s.queryLog.Add(msg, d.Res, res, elapsed, d.Addr, upstreamAddr) </s> remove func createDataDir(t *testing.T) string {
err := os.MkdirAll(dataDir, 0755)
if err != nil {
t.Fatalf("Cannot create %s: %s", dataDir, err)
}
return dataDir
}
func removeDataDir(t *testing.T) {
err := os.RemoveAll(dataDir)
if err != nil {
t.Fatalf("Cannot remove %s: %s", dataDir, err)
}
}
</s> add </s> remove // -----
// stats
// -----
func handleQueryLogEnable(w http.ResponseWriter, r *http.Request) {
config.DNS.QueryLogEnabled = true
httpUpdateConfigReloadDNSReturnOK(w, r)
}
func handleQueryLogDisable(w http.ResponseWriter, r *http.Request) {
config.DNS.QueryLogEnabled = false
httpUpdateConfigReloadDNSReturnOK(w, r)
}
func handleQueryLog(w http.ResponseWriter, r *http.Request) {
data := config.dnsServer.GetQueryLog()
jsonVal, err := json.Marshal(data)
if err != nil {
httpError(w, http.StatusInternalServerError, "Couldn't marshal data into json: %s", err)
return
}
w.Header().Set("Content-Type", "application/json")
_, err = w.Write(jsonVal)
if err != nil {
httpError(w, http.StatusInternalServerError, "Unable to write response json: %s", err)
}
}
</s> add </s> remove
log.Printf("Start DNS server periodic jobs")
go s.queryLog.periodicQueryLogRotate()
</s> add s.queryLog = queryLog | [
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8104c902eed397d2b34f43be485d49e444ca8cc7 | home/dns.go |
<mask> "github.com/miekg/dns"
<mask> "golang.org/x/net/publicsuffix"
<mask> )
<mask>
<mask> const defaultCacheSize = 64 * 1024 // in number of elements
<mask> const defaultCacheTime = 30 * time.Minute
<mask>
<mask> const defaultHTTPTimeout = 5 * time.Minute
<mask> const defaultHTTPMaxIdleConnections = 100
<mask>
</s> + config: add cache size settings </s> remove gctx.safebrowsingCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
</s> add gctx.safebrowsingCache = gcache.New(c.SafeBrowsingCacheSize).LRU().Expiration(defaultCacheTime).Build() </s> remove gctx.parentalCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
</s> add gctx.parentalCache = gcache.New(c.ParentalCacheSize).LRU().Expiration(defaultCacheTime).Build() </s> remove gctx.safeSearchCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
</s> add gctx.safeSearchCache = gcache.New(c.SafeSearchCacheSize).LRU().Expiration(defaultCacheTime).Build() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/81303b5db74705535b9810b7daddd196891079c5 | dnsfilter/dnsfilter.go |
|
SafeBrowsingCacheSize int `yaml:"safebrowsing_cache_size"`
SafeSearchCacheSize int `yaml:"safesearch_cache_size"`
ParentalCacheSize int `yaml:"parental_cache_size"`
| <mask> SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
<mask> ResolverAddress string // DNS server address
<mask>
<mask> // Filtering callback function
<mask> FilterHandler func(clientAddr string, settings *RequestFilteringSettings) `yaml:"-"`
<mask> }
<mask>
</s> + config: add cache size settings </s> remove gctx.safebrowsingCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
</s> add gctx.safebrowsingCache = gcache.New(c.SafeBrowsingCacheSize).LRU().Expiration(defaultCacheTime).Build() </s> remove const defaultCacheSize = 64 * 1024 // in number of elements
</s> add </s> remove gctx.parentalCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
</s> add gctx.parentalCache = gcache.New(c.ParentalCacheSize).LRU().Expiration(defaultCacheTime).Build() </s> remove gctx.safeSearchCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
</s> add gctx.safeSearchCache = gcache.New(c.SafeSearchCacheSize).LRU().Expiration(defaultCacheTime).Build() | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/81303b5db74705535b9810b7daddd196891079c5 | dnsfilter/dnsfilter.go |
gctx.safebrowsingCache = gcache.New(c.SafeBrowsingCacheSize).LRU().Expiration(defaultCacheTime).Build() | <mask>
<mask> if c != nil {
<mask> // initialize objects only once
<mask> if gctx.safebrowsingCache == nil {
<mask> gctx.safebrowsingCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
<mask> }
<mask> if gctx.safeSearchCache == nil {
<mask> gctx.safeSearchCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
<mask> }
<mask> if gctx.parentalCache == nil {
</s> + config: add cache size settings </s> remove gctx.safeSearchCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
</s> add gctx.safeSearchCache = gcache.New(c.SafeSearchCacheSize).LRU().Expiration(defaultCacheTime).Build() </s> remove gctx.parentalCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
</s> add gctx.parentalCache = gcache.New(c.ParentalCacheSize).LRU().Expiration(defaultCacheTime).Build() </s> remove const defaultCacheSize = 64 * 1024 // in number of elements
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/81303b5db74705535b9810b7daddd196891079c5 | dnsfilter/dnsfilter.go |
gctx.safeSearchCache = gcache.New(c.SafeSearchCacheSize).LRU().Expiration(defaultCacheTime).Build() | <mask> if gctx.safebrowsingCache == nil {
<mask> gctx.safebrowsingCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
<mask> }
<mask> if gctx.safeSearchCache == nil {
<mask> gctx.safeSearchCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
<mask> }
<mask> if gctx.parentalCache == nil {
<mask> gctx.parentalCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
<mask> }
<mask> if len(c.ResolverAddress) != 0 && gctx.dialCache == nil {
</s> + config: add cache size settings </s> remove gctx.parentalCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
</s> add gctx.parentalCache = gcache.New(c.ParentalCacheSize).LRU().Expiration(defaultCacheTime).Build() </s> remove gctx.safebrowsingCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
</s> add gctx.safebrowsingCache = gcache.New(c.SafeBrowsingCacheSize).LRU().Expiration(defaultCacheTime).Build() </s> remove const defaultCacheSize = 64 * 1024 // in number of elements
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/81303b5db74705535b9810b7daddd196891079c5 | dnsfilter/dnsfilter.go |
gctx.parentalCache = gcache.New(c.ParentalCacheSize).LRU().Expiration(defaultCacheTime).Build() | <mask> if gctx.safeSearchCache == nil {
<mask> gctx.safeSearchCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
<mask> }
<mask> if gctx.parentalCache == nil {
<mask> gctx.parentalCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
<mask> }
<mask> if len(c.ResolverAddress) != 0 && gctx.dialCache == nil {
<mask> gctx.dialCache = gcache.New(maxDialCacheSize).LRU().Expiration(defaultCacheTime).Build()
<mask> }
<mask> }
</s> + config: add cache size settings </s> remove gctx.safeSearchCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
</s> add gctx.safeSearchCache = gcache.New(c.SafeSearchCacheSize).LRU().Expiration(defaultCacheTime).Build() </s> remove gctx.safebrowsingCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
</s> add gctx.safebrowsingCache = gcache.New(c.SafeBrowsingCacheSize).LRU().Expiration(defaultCacheTime).Build() </s> remove const defaultCacheSize = 64 * 1024 // in number of elements
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/81303b5db74705535b9810b7daddd196891079c5 | dnsfilter/dnsfilter.go |
config.DNS.SafeBrowsingCacheSize = 64 * 1024
config.DNS.SafeSearchCacheSize = 64 * 1024
config.DNS.ParentalCacheSize = 64 * 1024 | <mask> config.DNS.UpstreamDNS = defaultDNS
<mask> }
<mask> }
<mask>
<mask> // getConfigFilename returns path to the current config file
<mask> func (c *configuration) getConfigFilename() string {
</s> + config: add cache size settings </s> remove gctx.safebrowsingCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
</s> add gctx.safebrowsingCache = gcache.New(c.SafeBrowsingCacheSize).LRU().Expiration(defaultCacheTime).Build() </s> remove gctx.parentalCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
</s> add gctx.parentalCache = gcache.New(c.ParentalCacheSize).LRU().Expiration(defaultCacheTime).Build() </s> remove gctx.safeSearchCache = gcache.New(defaultCacheSize).LRU().Expiration(defaultCacheTime).Build()
</s> add gctx.safeSearchCache = gcache.New(c.SafeSearchCacheSize).LRU().Expiration(defaultCacheTime).Build() </s> remove const defaultCacheSize = 64 * 1024 // in number of elements
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/81303b5db74705535b9810b7daddd196891079c5 | home/config.go |
"path/filepath" | <mask> "net"
<mask> "net/http"
<mask> "net/url"
<mask> "os"
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/util"
<mask> "github.com/AdguardTeam/golibs/log"
</s> + filters: support filters from local disk </s> remove // IsValidURL - return TRUE if URL is valid
</s> add // IsValidURL - return TRUE if URL or file path is valid </s> remove description: "URL containing filtering rules"
</s> add description: "URL or an absolute path to the file containing filtering rules" </s> remove summary: 'Add filter URL'
</s> add summary: 'Add filter URL or an absolute file path' </s> remove n, err := resp.Body.Read(buf)
</s> add n, err := reader.Read(buf) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/81309c707a70ff15a7075fb5906962764b470ca7 | home/control_filtering.go |
"github.com/AdguardTeam/AdGuardHome/util" | <mask> "time"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
</s> + filters: support filters from local disk </s> remove // IsValidURL - return TRUE if URL is valid
</s> add // IsValidURL - return TRUE if URL or file path is valid </s> remove description: "URL containing filtering rules"
</s> add description: "URL or an absolute path to the file containing filtering rules" </s> remove summary: 'Add filter URL'
</s> add summary: 'Add filter URL or an absolute file path' </s> remove n, err := resp.Body.Read(buf)
</s> add n, err := reader.Read(buf) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/81309c707a70ff15a7075fb5906962764b470ca7 | home/control_filtering.go |
// IsValidURL - return TRUE if URL or file path is valid | <mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> // IsValidURL - return TRUE if URL is valid
<mask> func IsValidURL(rawurl string) bool {
<mask> url, err := url.ParseRequestURI(rawurl)
<mask> if err != nil {
<mask> return false //Couldn't even parse the rawurl
<mask> }
</s> + filters: support filters from local disk </s> remove resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
}
</s> add var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return false, fmt.Errorf("open file: %s", err)
}
defer f.Close()
reader = f
} else {
resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
} </s> remove if !IsValidURL(req.URL) {
http.Error(w, "URL parameter is not valid request URL", http.StatusBadRequest)
return
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/81309c707a70ff15a7075fb5906962764b470ca7 | home/control_filtering.go |
if filepath.IsAbs(rawurl) {
// this is a file path
return util.FileExists(rawurl)
}
| <mask> // IsValidURL - return TRUE if URL or file path is valid
<mask> func IsValidURL(rawurl string) bool {
<mask> url, err := url.ParseRequestURI(rawurl)
<mask> if err != nil {
<mask> return false //Couldn't even parse the rawurl
<mask> }
<mask> if len(url.Scheme) == 0 {
</s> + filters: support filters from local disk </s> remove // IsValidURL - return TRUE if URL is valid
</s> add // IsValidURL - return TRUE if URL or file path is valid </s> remove resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
}
</s> add var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return false, fmt.Errorf("open file: %s", err)
}
defer f.Close()
reader = f
} else {
resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
} </s> remove if !IsValidURL(req.URL) {
http.Error(w, "URL parameter is not valid request URL", http.StatusBadRequest)
return
}
</s> add </s> remove if resp.StatusCode != 200 {
log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
return false, fmt.Errorf("got status code != 200: %d", resp.StatusCode)
</s> add if resp.StatusCode != 200 {
log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
return false, fmt.Errorf("got status code != 200: %d", resp.StatusCode)
}
reader = resp.Body | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/81309c707a70ff15a7075fb5906962764b470ca7 | home/control_filtering.go |
http.Error(w, "Invalid URL or file path", http.StatusBadRequest) | <mask> return
<mask> }
<mask>
<mask> if !IsValidURL(fj.URL) {
<mask> http.Error(w, "Invalid URL", http.StatusBadRequest)
<mask> return
<mask> }
<mask>
<mask> // Check for duplicates
<mask> if filterExists(fj.URL) {
</s> + filters: support filters from local disk </s> remove http.Error(w, "invalid URL", http.StatusBadRequest)
</s> add http.Error(w, "invalid URL or file path", http.StatusBadRequest) </s> remove if !IsValidURL(req.URL) {
http.Error(w, "URL parameter is not valid request URL", http.StatusBadRequest)
return
}
</s> add </s> remove resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
}
</s> add var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return false, fmt.Errorf("open file: %s", err)
}
defer f.Close()
reader = f
} else {
resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/81309c707a70ff15a7075fb5906962764b470ca7 | home/control_filtering.go |
<mask> httpError(w, http.StatusBadRequest, "Failed to parse request body json: %s", err)
<mask> return
<mask> }
<mask>
<mask> if !IsValidURL(req.URL) {
<mask> http.Error(w, "URL parameter is not valid request URL", http.StatusBadRequest)
<mask> return
<mask> }
<mask>
<mask> // go through each element and delete if url matches
<mask> config.Lock()
<mask> newFilters := []filter{}
<mask> filters := &config.Filters
<mask> if req.Whitelist {
</s> + filters: support filters from local disk </s> remove http.Error(w, "invalid URL", http.StatusBadRequest)
</s> add http.Error(w, "invalid URL or file path", http.StatusBadRequest) </s> remove http.Error(w, "Invalid URL", http.StatusBadRequest)
</s> add http.Error(w, "Invalid URL or file path", http.StatusBadRequest) </s> remove resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
}
</s> add var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return false, fmt.Errorf("open file: %s", err)
}
defer f.Close()
reader = f
} else {
resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
} </s> remove // IsValidURL - return TRUE if URL is valid
</s> add // IsValidURL - return TRUE if URL or file path is valid | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/81309c707a70ff15a7075fb5906962764b470ca7 | home/control_filtering.go |
|
http.Error(w, "invalid URL or file path", http.StatusBadRequest) | <mask> return
<mask> }
<mask>
<mask> if !IsValidURL(fj.URL) {
<mask> http.Error(w, "invalid URL", http.StatusBadRequest)
<mask> return
<mask> }
<mask>
<mask> filt := filter{
<mask> Enabled: fj.Data.Enabled,
</s> + filters: support filters from local disk </s> remove http.Error(w, "Invalid URL", http.StatusBadRequest)
</s> add http.Error(w, "Invalid URL or file path", http.StatusBadRequest) </s> remove if !IsValidURL(req.URL) {
http.Error(w, "URL parameter is not valid request URL", http.StatusBadRequest)
return
}
</s> add </s> remove resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
}
</s> add var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return false, fmt.Errorf("open file: %s", err)
}
defer f.Close()
reader = f
} else {
resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
} </s> remove if resp.StatusCode != 200 {
log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
return false, fmt.Errorf("got status code != 200: %d", resp.StatusCode)
</s> add if resp.StatusCode != 200 {
log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
return false, fmt.Errorf("got status code != 200: %d", resp.StatusCode)
}
reader = resp.Body | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/81309c707a70ff15a7075fb5906962764b470ca7 | home/control_filtering.go |
URL string // URL or a file path | <mask>
<mask> // field ordering is important -- yaml fields will mirror ordering from here
<mask> type filter struct {
<mask> Enabled bool
<mask> URL string
<mask> Name string `yaml:"name"`
<mask> RulesCount int `yaml:"-"`
<mask> LastUpdated time.Time `yaml:"-"`
<mask> checksum uint32 // checksum of the file data
<mask> white bool
</s> + filters: support filters from local disk </s> remove // IsValidURL - return TRUE if URL is valid
</s> add // IsValidURL - return TRUE if URL or file path is valid </s> remove if resp.StatusCode != 200 {
log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
return false, fmt.Errorf("got status code != 200: %d", resp.StatusCode)
</s> add if resp.StatusCode != 200 {
log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
return false, fmt.Errorf("got status code != 200: %d", resp.StatusCode)
}
reader = resp.Body </s> remove resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
}
</s> add var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return false, fmt.Errorf("open file: %s", err)
}
defer f.Close()
reader = f
} else {
resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
} </s> remove n, err := resp.Body.Read(buf)
</s> add n, err := reader.Read(buf) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/81309c707a70ff15a7075fb5906962764b470ca7 | home/filter.go |
// nolint(gocyclo) | <mask> return b, err
<mask> }
<mask>
<mask> func (f *Filtering) updateIntl(filter *filter) (bool, error) {
<mask> log.Tracef("Downloading update for filter %d from %s", filter.ID, filter.URL)
<mask>
<mask> tmpFile, err := ioutil.TempFile(filepath.Join(Context.getDataDir(), filterDir), "")
<mask> if err != nil {
</s> + filters: support filters from local disk </s> remove resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
}
</s> add var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return false, fmt.Errorf("open file: %s", err)
}
defer f.Close()
reader = f
} else {
resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
} </s> remove if resp.StatusCode != 200 {
log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
return false, fmt.Errorf("got status code != 200: %d", resp.StatusCode)
</s> add if resp.StatusCode != 200 {
log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
return false, fmt.Errorf("got status code != 200: %d", resp.StatusCode)
}
reader = resp.Body </s> remove // IsValidURL - return TRUE if URL is valid
</s> add // IsValidURL - return TRUE if URL or file path is valid </s> remove http.Error(w, "Invalid URL", http.StatusBadRequest)
</s> add http.Error(w, "Invalid URL or file path", http.StatusBadRequest) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/81309c707a70ff15a7075fb5906962764b470ca7 | home/filter.go |
var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return false, fmt.Errorf("open file: %s", err)
}
defer f.Close()
reader = f
} else {
resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
} | <mask> _ = os.Remove(tmpFile.Name())
<mask> }
<mask> }()
<mask>
<mask> resp, err := Context.client.Get(filter.URL)
<mask> if resp != nil && resp.Body != nil {
<mask> defer resp.Body.Close()
<mask> }
<mask> if err != nil {
<mask> log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
<mask> return false, err
<mask> }
<mask>
<mask> if resp.StatusCode != 200 {
<mask> log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
<mask> return false, fmt.Errorf("got status code != 200: %d", resp.StatusCode)
<mask> }
</s> + filters: support filters from local disk </s> remove if resp.StatusCode != 200 {
log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
return false, fmt.Errorf("got status code != 200: %d", resp.StatusCode)
</s> add if resp.StatusCode != 200 {
log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
return false, fmt.Errorf("got status code != 200: %d", resp.StatusCode)
}
reader = resp.Body </s> remove // IsValidURL - return TRUE if URL is valid
</s> add // IsValidURL - return TRUE if URL or file path is valid </s> remove if !IsValidURL(req.URL) {
http.Error(w, "URL parameter is not valid request URL", http.StatusBadRequest)
return
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/81309c707a70ff15a7075fb5906962764b470ca7 | home/filter.go |
if resp.StatusCode != 200 {
log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
return false, fmt.Errorf("got status code != 200: %d", resp.StatusCode)
}
reader = resp.Body | <mask> log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
<mask> return false, err
<mask> }
<mask>
<mask> if resp.StatusCode != 200 {
<mask> log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
<mask> return false, fmt.Errorf("got status code != 200: %d", resp.StatusCode)
<mask> }
<mask>
<mask> htmlTest := true
<mask> firstChunk := make([]byte, 4*1024)
<mask> firstChunkLen := 0
</s> + filters: support filters from local disk </s> remove resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
}
</s> add var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return false, fmt.Errorf("open file: %s", err)
}
defer f.Close()
reader = f
} else {
resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
} </s> remove n, err := resp.Body.Read(buf)
</s> add n, err := reader.Read(buf) </s> remove if !IsValidURL(req.URL) {
http.Error(w, "URL parameter is not valid request URL", http.StatusBadRequest)
return
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/81309c707a70ff15a7075fb5906962764b470ca7 | home/filter.go |
n, err := reader.Read(buf) | <mask> firstChunkLen := 0
<mask> buf := make([]byte, 64*1024)
<mask> total := 0
<mask> for {
<mask> n, err := resp.Body.Read(buf)
<mask> total += n
<mask>
<mask> if htmlTest {
<mask> // gather full buffer firstChunk and perform its data tests
<mask> num := util.MinInt(n, len(firstChunk)-firstChunkLen)
</s> + filters: support filters from local disk </s> remove if resp.StatusCode != 200 {
log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
return false, fmt.Errorf("got status code != 200: %d", resp.StatusCode)
</s> add if resp.StatusCode != 200 {
log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
return false, fmt.Errorf("got status code != 200: %d", resp.StatusCode)
}
reader = resp.Body </s> remove if !IsValidURL(req.URL) {
http.Error(w, "URL parameter is not valid request URL", http.StatusBadRequest)
return
}
</s> add </s> remove resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
}
</s> add var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return false, fmt.Errorf("open file: %s", err)
}
defer f.Close()
reader = f
} else {
resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/81309c707a70ff15a7075fb5906962764b470ca7 | home/filter.go |
summary: 'Add filter URL or an absolute file path' | <mask> post:
<mask> tags:
<mask> - filtering
<mask> operationId: filteringAddURL
<mask> summary: 'Add filter URL'
<mask> consumes:
<mask> - application/json
<mask> parameters:
<mask> - in: "body"
<mask> name: "body"
</s> + filters: support filters from local disk </s> remove // IsValidURL - return TRUE if URL is valid
</s> add // IsValidURL - return TRUE if URL or file path is valid </s> remove description: "URL containing filtering rules"
</s> add description: "URL or an absolute path to the file containing filtering rules" </s> remove URL string
</s> add URL string // URL or a file path | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/81309c707a70ff15a7075fb5906962764b470ca7 | openapi/openapi.yaml |
description: "URL or an absolute path to the file containing filtering rules" | <mask> properties:
<mask> name:
<mask> type: "string"
<mask> url:
<mask> description: "URL containing filtering rules"
<mask> type: "string"
<mask> example: "https://filters.adtidy.org/windows/filters/15.txt"
<mask> RemoveUrlRequest:
<mask> type: "object"
<mask> description: "/remove_url request data"
</s> + filters: support filters from local disk </s> remove summary: 'Add filter URL'
</s> add summary: 'Add filter URL or an absolute file path' </s> remove if !IsValidURL(req.URL) {
http.Error(w, "URL parameter is not valid request URL", http.StatusBadRequest)
return
}
</s> add </s> remove resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
}
</s> add var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return false, fmt.Errorf("open file: %s", err)
}
defer f.Close()
reader = f
} else {
resp, err := Context.client.Get(filter.URL)
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
if err != nil {
log.Printf("Couldn't request filter from URL %s, skipping: %s", filter.URL, err)
return false, err
} </s> remove if resp.StatusCode != 200 {
log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
return false, fmt.Errorf("got status code != 200: %d", resp.StatusCode)
</s> add if resp.StatusCode != 200 {
log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
return false, fmt.Errorf("got status code != 200: %d", resp.StatusCode)
}
reader = resp.Body </s> remove n, err := resp.Body.Read(buf)
</s> add n, err := reader.Read(buf) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/81309c707a70ff15a7075fb5906962764b470ca7 | openapi/openapi.yaml |
now := time.Now()
timeWindow := time.Minute * 3
notBefore := now.Add(timeWindow * -1) | <mask>
<mask> domains := map[string]int{}
<mask> blocked := map[string]int{}
<mask> clients := map[string]int{}
<mask>
<mask> for _, value := range values {
<mask> entry, ok := value.(map[string]interface{})
<mask> if !ok {
</s> API /stats_top -- show only top entries for last 3 minutes | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8198b65f29f83e2ff51d4c0f89a7b7dcbe9c2fc1 | control.go |
time := getTime(entry)
if time.Before(notBefore) {
// skip if the entry is before specified cutoff
continue
} | <mask> host := getHost(entry)
<mask> reason := getReason(entry)
<mask> client := getClient(entry)
<mask> if len(host) > 0 {
<mask> domains[host]++
<mask> }
<mask> if len(host) > 0 && strings.HasPrefix(reason, "Filtered") {
<mask> blocked[host]++
<mask> }
</s> API /stats_top -- show only top entries for last 3 minutes | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8198b65f29f83e2ff51d4c0f89a7b7dcbe9c2fc1 | control.go |
"time" | <mask> "sort"
<mask> "strings"
<mask> )
<mask>
<mask> func clamp(value, low, high int) int {
<mask> if value < low {
<mask> return low
<mask> }
</s> API /stats_top -- show only top entries for last 3 minutes | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8198b65f29f83e2ff51d4c0f89a7b7dcbe9c2fc1 | helpers.go |
func getTime(entry map[string]interface{}) time.Time {
t, ok := entry["time"]
if !ok {
return time.Time{}
}
tstr, ok := t.(string)
if !ok {
return time.Time{}
}
value, err := time.Parse(time.RFC3339, tstr)
if err != nil {
return time.Time{}
}
return value
}
| <mask> }
<mask>
<mask> // -------------------------------------------------
<mask> // helper functions for parsing parameters from body
<mask> // -------------------------------------------------
<mask> func parseParametersFromBody(r io.Reader) (map[string]string, error) {
<mask> parameters := map[string]string{}
</s> API /stats_top -- show only top entries for last 3 minutes | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8198b65f29f83e2ff51d4c0f89a7b7dcbe9c2fc1 | helpers.go |
func NewARPDB() (arp ARPDB) {
return newARPDB() | <mask> Neighbors() (ns []Neighbor)
<mask> }
<mask>
<mask> // NewARPDB returns the ARPDB properly initialized for the OS.
<mask> func NewARPDB() (arp ARPDB, err error) {
<mask> arp = newARPDB()
<mask>
<mask> err = arp.Refresh()
<mask> if err != nil {
<mask> return nil, fmt.Errorf("arpdb initial refresh: %w", err)
<mask> }
<mask>
<mask> return arp, nil
<mask> }
<mask>
<mask> // Empty ARPDB implementation
<mask>
<mask> // EmptyARPDB is the ARPDB implementation that does nothing.
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove s.sysResolvers, err = aghnet.NewSystemResolvers(0, nil)
</s> add s.sysResolvers, err = aghnet.NewSystemResolvers(nil) </s> remove }
if len(ifaces) == 0 {
</s> add } else if len(ifaces) == 0 { </s> remove // refreshWithTicker refreshes the cache of sr after each tick form tickCh.
func refreshWithTicker(sr SystemResolvers, tickCh <-chan time.Time) {
defer log.OnPanic("systemResolvers")
// TODO(e.burkov): Implement a functionality to stop ticker.
for range tickCh {
err := sr.refresh()
if err != nil {
log.Error("systemResolvers: error in refreshing goroutine: %s", err)
continue
}
log.Debug("systemResolvers: local addresses cache is refreshed")
}
}
</s> add </s> remove sr = newSystemResolvers(refreshIvl, hostGenFunc)
</s> add sr = newSystemResolvers(hostGenFunc) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/arpdb.go |
invalid.mac (1.2.3.4) at 12:34:56:78:910 on el0 ifscope [ethernet]
invalid.ip (1.2.3.4.5) at ab:cd:ef:ab:cd:12 on ek0 ifscope [ethernet]
invalid.fmt 1 at 12:cd:ef:ab:cd:ef on er0 ifscope [ethernet] | <mask> "net"
<mask> )
<mask>
<mask> const arpAOutput = `
<mask> hostname.one (192.168.1.2) at ab:cd:ef:ab:cd:ef on en0 ifscope [ethernet]
<mask> hostname.two (::ffff:ffff) at ef:cd:ab:ef:cd:ab on em0 expires in 1198 seconds [ethernet]
<mask> ? (::1234) at aa:bb:cc:dd:ee:ff on ej0 expires in 1918 seconds [ethernet]
<mask> `
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/arpdb_bsd_test.go |
? (::1234) at aa:bb:cc:dd:ee:ff on ej0 expires in 1918 seconds [ethernet] | <mask> hostname.one (192.168.1.2) at ab:cd:ef:ab:cd:ef on en0 ifscope [ethernet]
<mask> hostname.two (::ffff:ffff) at ef:cd:ab:ef:cd:ab on em0 expires in 1198 seconds [ethernet]
<mask> `
<mask>
<mask> var wantNeighs = []Neighbor{{
<mask> Name: "hostname.one",
<mask> IP: net.IPv4(192, 168, 1, 2),
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/arpdb_bsd_test.go |
}, {
Name: "",
IP: net.ParseIP("::1234"),
MAC: net.HardwareAddr{0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF}, | <mask> Name: "hostname.two",
<mask> IP: net.ParseIP("::ffff:ffff"),
<mask> MAC: net.HardwareAddr{0xEF, 0xCD, 0xAB, 0xEF, 0xCD, 0xAB},
<mask> }}
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove var arpdb aghnet.ARPDB
arpdb, err = aghnet.NewARPDB()
if err != nil {
log.Info("warning: creating arpdb: %s; using stub", err)
arpdb = aghnet.EmptyARPDB{}
}
</s> add arpdb := aghnet.NewARPDB() </s> remove import (
"time"
"github.com/AdguardTeam/golibs/log"
)
</s> add | [
"keep",
"keep",
"add",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/arpdb_bsd_test.go |
1.2.3.4.5 0x1 0x2 aa:bb:cc:dd:ee:ff * wan
1.2.3.4 0x1 0x2 12:34:56:78:910 * wan | <mask> )
<mask>
<mask> const arpAOutputWrt = `
<mask> IP address HW type Flags HW address Mask Device
<mask> 192.168.1.2 0x1 0x2 ab:cd:ef:ab:cd:ef * wan
<mask> ::ffff:ffff 0x1 0x2 ef:cd:ab:ef:cd:ab * wan`
<mask>
<mask> const arpAOutput = `
<mask> invalid.mac (1.2.3.4) at 12:34:56:78:910 on el0 ifscope [ethernet]
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove 0.0.0.0 0x0 0x0 00:00:00:00:00:00 * unspec </s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/arpdb_linux_test.go |
invalid.mac (1.2.3.4) at 12:34:56:78:910 on el0 ifscope [ethernet]
invalid.ip (1.2.3.4.5) at ab:cd:ef:ab:cd:12 on ek0 ifscope [ethernet]
invalid.fmt 1 at 12:cd:ef:ab:cd:ef on er0 ifscope [ethernet] | <mask>
<mask> const arpAOutput = `
<mask> ? (192.168.1.2) at ab:cd:ef:ab:cd:ef on en0 ifscope [ethernet]
<mask> ? (::ffff:ffff) at ef:cd:ab:ef:cd:ab on em0 expires in 100 seconds [ethernet]`
<mask>
<mask> const ipNeighOutput = `
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/arpdb_linux_test.go |
1.2.3.4.5 dev enp0s3 lladdr aa:bb:cc:dd:ee:ff DELAY
1.2.3.4 dev enp0s3 lladdr 12:34:56:78:910 DELAY | <mask> ? (::ffff:ffff) at ef:cd:ab:ef:cd:ab on em0 expires in 100 seconds [ethernet]`
<mask>
<mask> const ipNeighOutput = `
<mask> 192.168.1.2 dev enp0s3 lladdr ab:cd:ef:ab:cd:ef DELAY
<mask> ::ffff:ffff dev enp0s3 lladdr ef:cd:ab:ef:cd:ab router STALE`
<mask>
<mask> var wantNeighs = []Neighbor{{
<mask> IP: net.IPv4(192, 168, 1, 2),
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/arpdb_linux_test.go |
1.2.3.4.5 aa:bb:cc:dd:ee:ff em0 permanent
1.2.3.4 12:34:56:78:910 em0 permanent | <mask> )
<mask>
<mask> const arpAOutput = `
<mask> Host Ethernet Address Netif Expire Flags
<mask> 192.168.1.2 ab:cd:ef:ab:cd:ef em0 19m56s
<mask> ::ffff:ffff ef:cd:ab:ef:cd:ab em0 permanent l
<mask> `
<mask>
<mask> var wantNeighs = []Neighbor{{
<mask> IP: net.IPv4(192, 168, 1, 2),
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/arpdb_openbsd_test.go |
"testing/iotest" | <mask> "strings"
<mask> "sync"
<mask> "testing"
<mask>
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/AdguardTeam/golibs/testutil"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove "time"
</s> add </s> remove "time"
</s> add </s> remove "time"
</s> add </s> remove func createTestSystemResolversImp(
</s> add func createTestSystemResolversImpl( | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/arpdb_test.go |
func TestNewARPDB(t *testing.T) {
var a ARPDB
require.NotPanics(t, func() {
a = NewARPDB()
})
assert.NotNil(t, a)
}
| <mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> // TestARPDB is the mock implementation of ARPDB to use in tests.
<mask> type TestARPDB struct {
<mask> OnRefresh func() (err error)
<mask> OnNeighbors func() (ns []Neighbor)
<mask> }
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove func NewARPDB() (arp ARPDB, err error) {
arp = newARPDB()
err = arp.Refresh()
if err != nil {
return nil, fmt.Errorf("arpdb initial refresh: %w", err)
}
return arp, nil
</s> add func NewARPDB() (arp ARPDB) {
return newARPDB() </s> remove // Get returns the slice of local resolvers' addresses. It should be
// safe for concurrent use.
</s> add // Get returns the slice of local resolvers' addresses. It must be safe for
// concurrent use. </s> remove resolver *net.Resolver
hostGenFunc HostGenFunc
// addrs is the set that contains cached local resolvers' addresses.
addrs *stringutil.Set
</s> add // addrsLock protects addrs. </s> remove var ipStr string
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/arpdb_test.go |
// writeRules writes the actual rule for the qtype and the PTR for the host-ip
// pair into internal builders. | <mask> log.Debug("%s: added ip-host pair %q-%q", hostsContainerPref, ip, h)
<mask> }
<mask> }
<mask>
<mask> // writeRules writes the actual rule for the qtype and the PTR for the
<mask> // host-ip pair into internal builders.
<mask> func (hp *hostsParser) writeRules(host string, ip net.IP) (rule, rulePtr string) {
<mask> arpa, err := netutil.IPToReversedAddr(ip)
<mask> if err != nil {
<mask> return "", ""
<mask> }
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove s.sysResolvers, err = aghnet.NewSystemResolvers(0, nil)
</s> add s.sysResolvers, err = aghnet.NewSystemResolvers(nil) </s> remove func NewARPDB() (arp ARPDB, err error) {
arp = newARPDB()
err = arp.Refresh()
if err != nil {
return nil, fmt.Errorf("arpdb initial refresh: %w", err)
}
return arp, nil
</s> add func NewARPDB() (arp ARPDB) {
return newARPDB() </s> remove // refreshWithTicker refreshes the cache of sr after each tick form tickCh.
func refreshWithTicker(sr SystemResolvers, tickCh <-chan time.Time) {
defer log.OnPanic("systemResolvers")
// TODO(e.burkov): Implement a functionality to stop ticker.
for range tickCh {
err := sr.refresh()
if err != nil {
log.Error("systemResolvers: error in refreshing goroutine: %s", err)
continue
}
log.Debug("systemResolvers: local addresses cache is refreshed")
}
}
</s> add </s> remove ipStr = parts[0]
</s> add host = parts[0] </s> remove refreshIvl time.Duration,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/hostscontainer.go |
} else if len(ifaces) == 0 { | <mask> func GetValidNetInterfacesForWeb() ([]*NetInterface, error) {
<mask> ifaces, err := net.Interfaces()
<mask> if err != nil {
<mask> return nil, fmt.Errorf("couldn't get interfaces: %w", err)
<mask> }
<mask> if len(ifaces) == 0 {
<mask> return nil, errors.Error("couldn't find any legible interface")
<mask> }
<mask>
<mask> var netInterfaces []*NetInterface
<mask>
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove if refreshIvl > 0 {
ticker := time.NewTicker(refreshIvl)
go refreshWithTicker(sr, ticker.C)
}
</s> add </s> remove s.sysResolvers, err = aghnet.NewSystemResolvers(0, nil)
</s> add s.sysResolvers, err = aghnet.NewSystemResolvers(nil) </s> remove func NewARPDB() (arp ARPDB, err error) {
arp = newARPDB()
err = arp.Refresh()
if err != nil {
return nil, fmt.Errorf("arpdb initial refresh: %w", err)
}
return arp, nil
</s> add func NewARPDB() (arp ARPDB) {
return newARPDB() </s> remove var arpdb aghnet.ARPDB
arpdb, err = aghnet.NewARPDB()
if err != nil {
log.Info("warning: creating arpdb: %s; using stub", err)
arpdb = aghnet.EmptyARPDB{}
}
</s> add arpdb := aghnet.NewARPDB() </s> remove sr = newSystemResolvers(refreshIvl, hostGenFunc)
</s> add sr = newSystemResolvers(hostGenFunc) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/net.go |
"github.com/AdguardTeam/golibs/errors" | <mask> "testing"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest"
<mask> "github.com/AdguardTeam/golibs/netutil"
<mask> "github.com/AdguardTeam/golibs/testutil"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove "time"
</s> add </s> remove "time"
</s> add </s> remove func createTestSystemResolversImp(
</s> add func createTestSystemResolversImpl( | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/net_test.go |
<mask> package aghnet
<mask>
<mask> import (
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> // DefaultRefreshIvl is the default period of time between refreshing cached
<mask> // addresses.
<mask> // const DefaultRefreshIvl = 5 * time.Minute
<mask>
<mask> // HostGenFunc is the signature for functions generating fake hostnames. The
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove resolver *net.Resolver
hostGenFunc HostGenFunc
// addrs is the set that contains cached local resolvers' addresses.
addrs *stringutil.Set
</s> add // addrsLock protects addrs. </s> remove "time"
</s> add </s> remove // refreshWithTicker refreshes the cache of sr after each tick form tickCh.
func refreshWithTicker(sr SystemResolvers, tickCh <-chan time.Time) {
defer log.OnPanic("systemResolvers")
// TODO(e.burkov): Implement a functionality to stop ticker.
for range tickCh {
err := sr.refresh()
if err != nil {
log.Error("systemResolvers: error in refreshing goroutine: %s", err)
continue
}
log.Debug("systemResolvers: local addresses cache is refreshed")
}
}
</s> add </s> remove // Get returns the slice of local resolvers' addresses. It should be
// safe for concurrent use.
</s> add // Get returns the slice of local resolvers' addresses. It must be safe for
// concurrent use. | [
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers.go |
|
// Get returns the slice of local resolvers' addresses. It must be safe for
// concurrent use. | <mask> type HostGenFunc func() (host string)
<mask>
<mask> // SystemResolvers helps to work with local resolvers' addresses provided by OS.
<mask> type SystemResolvers interface {
<mask> // Get returns the slice of local resolvers' addresses. It should be
<mask> // safe for concurrent use.
<mask> Get() (rs []string)
<mask> // refresh refreshes the local resolvers' addresses cache. It should be
<mask> // safe for concurrent use.
<mask> refresh() (err error)
<mask> }
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove // refresh refreshes the local resolvers' addresses cache. It should be
// safe for concurrent use.
</s> add // refresh refreshes the local resolvers' addresses cache. It must be safe
// for concurrent use. </s> remove // refreshWithTicker refreshes the cache of sr after each tick form tickCh.
func refreshWithTicker(sr SystemResolvers, tickCh <-chan time.Time) {
defer log.OnPanic("systemResolvers")
// TODO(e.burkov): Implement a functionality to stop ticker.
for range tickCh {
err := sr.refresh()
if err != nil {
log.Error("systemResolvers: error in refreshing goroutine: %s", err)
continue
}
log.Debug("systemResolvers: local addresses cache is refreshed")
}
}
</s> add </s> remove refreshIvl time.Duration,
</s> add </s> remove resolver *net.Resolver
hostGenFunc HostGenFunc
// addrs is the set that contains cached local resolvers' addresses.
addrs *stringutil.Set
</s> add // addrsLock protects addrs. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers.go |
// refresh refreshes the local resolvers' addresses cache. It must be safe
// for concurrent use. | <mask> type SystemResolvers interface {
<mask> // Get returns the slice of local resolvers' addresses. It should be
<mask> // safe for concurrent use.
<mask> Get() (rs []string)
<mask> // refresh refreshes the local resolvers' addresses cache. It should be
<mask> // safe for concurrent use.
<mask> refresh() (err error)
<mask> }
<mask>
<mask> // refreshWithTicker refreshes the cache of sr after each tick form tickCh.
<mask> func refreshWithTicker(sr SystemResolvers, tickCh <-chan time.Time) {
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove // Get returns the slice of local resolvers' addresses. It should be
// safe for concurrent use.
</s> add // Get returns the slice of local resolvers' addresses. It must be safe for
// concurrent use. </s> remove // refreshWithTicker refreshes the cache of sr after each tick form tickCh.
func refreshWithTicker(sr SystemResolvers, tickCh <-chan time.Time) {
defer log.OnPanic("systemResolvers")
// TODO(e.burkov): Implement a functionality to stop ticker.
for range tickCh {
err := sr.refresh()
if err != nil {
log.Error("systemResolvers: error in refreshing goroutine: %s", err)
continue
}
log.Debug("systemResolvers: local addresses cache is refreshed")
}
}
</s> add </s> remove refreshIvl time.Duration,
</s> add </s> remove resolver *net.Resolver
hostGenFunc HostGenFunc
// addrs is the set that contains cached local resolvers' addresses.
addrs *stringutil.Set
</s> add // addrsLock protects addrs. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers.go |
<mask> // safe for concurrent use.
<mask> refresh() (err error)
<mask> }
<mask>
<mask> // refreshWithTicker refreshes the cache of sr after each tick form tickCh.
<mask> func refreshWithTicker(sr SystemResolvers, tickCh <-chan time.Time) {
<mask> defer log.OnPanic("systemResolvers")
<mask>
<mask> // TODO(e.burkov): Implement a functionality to stop ticker.
<mask> for range tickCh {
<mask> err := sr.refresh()
<mask> if err != nil {
<mask> log.Error("systemResolvers: error in refreshing goroutine: %s", err)
<mask>
<mask> continue
<mask> }
<mask>
<mask> log.Debug("systemResolvers: local addresses cache is refreshed")
<mask> }
<mask> }
<mask>
<mask> // NewSystemResolvers returns a SystemResolvers with the cache refresh rate
<mask> // defined by refreshIvl. It disables auto-resfreshing if refreshIvl is 0. If
<mask> // nil is passed for hostGenFunc, the default generator will be used.
<mask> func NewSystemResolvers(
<mask> refreshIvl time.Duration,
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove refreshIvl time.Duration,
</s> add </s> remove // refresh refreshes the local resolvers' addresses cache. It should be
// safe for concurrent use.
</s> add // refresh refreshes the local resolvers' addresses cache. It must be safe
// for concurrent use. </s> remove // Get returns the slice of local resolvers' addresses. It should be
// safe for concurrent use.
</s> add // Get returns the slice of local resolvers' addresses. It must be safe for
// concurrent use. </s> remove sr = newSystemResolvers(refreshIvl, hostGenFunc)
</s> add sr = newSystemResolvers(hostGenFunc) </s> remove func NewARPDB() (arp ARPDB, err error) {
arp = newARPDB()
err = arp.Refresh()
if err != nil {
return nil, fmt.Errorf("arpdb initial refresh: %w", err)
}
return arp, nil
</s> add func NewARPDB() (arp ARPDB) {
return newARPDB() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers.go |
|
<mask> // NewSystemResolvers returns a SystemResolvers with the cache refresh rate
<mask> // defined by refreshIvl. It disables auto-resfreshing if refreshIvl is 0. If
<mask> // nil is passed for hostGenFunc, the default generator will be used.
<mask> func NewSystemResolvers(
<mask> refreshIvl time.Duration,
<mask> hostGenFunc HostGenFunc,
<mask> ) (sr SystemResolvers, err error) {
<mask> sr = newSystemResolvers(refreshIvl, hostGenFunc)
<mask>
<mask> // Fill cache.
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove // refreshWithTicker refreshes the cache of sr after each tick form tickCh.
func refreshWithTicker(sr SystemResolvers, tickCh <-chan time.Time) {
defer log.OnPanic("systemResolvers")
// TODO(e.burkov): Implement a functionality to stop ticker.
for range tickCh {
err := sr.refresh()
if err != nil {
log.Error("systemResolvers: error in refreshing goroutine: %s", err)
continue
}
log.Debug("systemResolvers: local addresses cache is refreshed")
}
}
</s> add </s> remove sr = newSystemResolvers(refreshIvl, hostGenFunc)
</s> add sr = newSystemResolvers(hostGenFunc) </s> remove // refresh refreshes the local resolvers' addresses cache. It should be
// safe for concurrent use.
</s> add // refresh refreshes the local resolvers' addresses cache. It must be safe
// for concurrent use. </s> remove // Get returns the slice of local resolvers' addresses. It should be
// safe for concurrent use.
</s> add // Get returns the slice of local resolvers' addresses. It must be safe for
// concurrent use. </s> remove resolver *net.Resolver
hostGenFunc HostGenFunc
// addrs is the set that contains cached local resolvers' addresses.
addrs *stringutil.Set
</s> add // addrsLock protects addrs. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers.go |
|
sr = newSystemResolvers(hostGenFunc) | <mask> func NewSystemResolvers(
<mask> refreshIvl time.Duration,
<mask> hostGenFunc HostGenFunc,
<mask> ) (sr SystemResolvers, err error) {
<mask> sr = newSystemResolvers(refreshIvl, hostGenFunc)
<mask>
<mask> // Fill cache.
<mask> err = sr.refresh()
<mask> if err != nil {
<mask> return nil, err
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove refreshIvl time.Duration,
</s> add </s> remove if refreshIvl > 0 {
ticker := time.NewTicker(refreshIvl)
go refreshWithTicker(sr, ticker.C)
}
</s> add </s> remove // refreshWithTicker refreshes the cache of sr after each tick form tickCh.
func refreshWithTicker(sr SystemResolvers, tickCh <-chan time.Time) {
defer log.OnPanic("systemResolvers")
// TODO(e.burkov): Implement a functionality to stop ticker.
for range tickCh {
err := sr.refresh()
if err != nil {
log.Error("systemResolvers: error in refreshing goroutine: %s", err)
continue
}
log.Debug("systemResolvers: local addresses cache is refreshed")
}
}
</s> add </s> remove func newSystemResolvers(refreshIvl time.Duration, hostGenFunc HostGenFunc) (sr SystemResolvers) {
</s> add func newSystemResolvers(hostGenFunc HostGenFunc) (sr SystemResolvers) { </s> remove refreshDur time.Duration,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers.go |
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> if refreshIvl > 0 {
<mask> ticker := time.NewTicker(refreshIvl)
<mask>
<mask> go refreshWithTicker(sr, ticker.C)
<mask> }
<mask>
<mask> return sr, nil
<mask> }
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove }
if len(ifaces) == 0 {
</s> add } else if len(ifaces) == 0 { </s> remove sr = newSystemResolvers(refreshIvl, hostGenFunc)
</s> add sr = newSystemResolvers(hostGenFunc) </s> remove if net.ParseIP(ipStr) == nil {
</s> add if _, err = netutil.ParseIP(host); err != nil { </s> remove var arpdb aghnet.ARPDB
arpdb, err = aghnet.NewARPDB()
if err != nil {
log.Info("warning: creating arpdb: %s; using stub", err)
arpdb = aghnet.EmptyARPDB{}
}
</s> add arpdb := aghnet.NewARPDB() </s> remove s.sysResolvers, err = aghnet.NewSystemResolvers(0, nil)
</s> add s.sysResolvers, err = aghnet.NewSystemResolvers(nil) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers.go |
|
// addrsLock protects addrs. | <mask> }
<mask>
<mask> // systemResolvers is a default implementation of SystemResolvers interface.
<mask> type systemResolvers struct {
<mask> resolver *net.Resolver
<mask> hostGenFunc HostGenFunc
<mask>
<mask> // addrs is the set that contains cached local resolvers' addresses.
<mask> addrs *stringutil.Set
<mask> addrsLock sync.RWMutex
<mask> }
<mask>
<mask> const (
<mask> // errBadAddrPassed is returned when dialFunc can't parse an IP address.
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove import (
"time"
"github.com/AdguardTeam/golibs/log"
)
</s> add </s> remove // Get returns the slice of local resolvers' addresses. It should be
// safe for concurrent use.
</s> add // Get returns the slice of local resolvers' addresses. It must be safe for
// concurrent use. </s> remove refreshIvl time.Duration,
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_others.go |
// addrs is the set that contains cached local resolvers' addresses.
addrs *stringutil.Set
// resolver is used to fetch the resolvers' addresses.
resolver *net.Resolver
// hostGenFunc generates hosts to resolve.
hostGenFunc HostGenFunc | <mask> type systemResolvers struct {
<mask> // addrsLock protects addrs.
<mask> addrsLock sync.RWMutex
<mask> }
<mask>
<mask> const (
<mask> // errBadAddrPassed is returned when dialFunc can't parse an IP address.
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove resolver *net.Resolver
hostGenFunc HostGenFunc
// addrs is the set that contains cached local resolvers' addresses.
addrs *stringutil.Set
</s> add // addrsLock protects addrs. </s> remove func newSystemResolvers(refreshIvl time.Duration, _ HostGenFunc) (sr SystemResolvers) {
</s> add func newSystemResolvers(_ HostGenFunc) (sr SystemResolvers) { </s> remove import (
"time"
"github.com/AdguardTeam/golibs/log"
)
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_others.go |
// refresh implements the SystemResolvers interface for *systemResolvers. | <mask> errUnexpectedHostFormat errors.Error = "unexpected host format"
<mask> )
<mask>
<mask> func (sr *systemResolvers) refresh() (err error) {
<mask> defer func() { err = errors.Annotate(err, "systemResolvers: %w") }()
<mask>
<mask> _, err = sr.resolver.LookupHost(context.Background(), sr.hostGenFunc())
<mask> dnserr := &net.DNSError{}
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove var ipStr string
</s> add </s> remove _, err := NewSystemResolvers(0, func() string {
</s> add _, err := NewSystemResolvers(func() string { </s> remove if net.ParseIP(ipStr) == nil {
</s> add if _, err = netutil.ParseIP(host); err != nil { </s> remove sr = newSystemResolvers(refreshIvl, hostGenFunc)
</s> add sr = newSystemResolvers(hostGenFunc) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_others.go |
func newSystemResolvers(hostGenFunc HostGenFunc) (sr SystemResolvers) { | <mask>
<mask> return err
<mask> }
<mask>
<mask> func newSystemResolvers(refreshIvl time.Duration, hostGenFunc HostGenFunc) (sr SystemResolvers) {
<mask> if hostGenFunc == nil {
<mask> hostGenFunc = defaultHostGen
<mask> }
<mask> s := &systemResolvers{
<mask> resolver: &net.Resolver{
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove func newSystemResolvers(refreshIvl time.Duration, _ HostGenFunc) (sr SystemResolvers) {
</s> add func newSystemResolvers(_ HostGenFunc) (sr SystemResolvers) { </s> remove refreshDur time.Duration,
</s> add </s> remove sr = newSystemResolvers(refreshIvl, hostGenFunc)
</s> add sr = newSystemResolvers(hostGenFunc) </s> remove if net.ParseIP(ipStr) == nil {
</s> add if _, err = netutil.ParseIP(host); err != nil { </s> remove }
if len(ifaces) == 0 {
</s> add } else if len(ifaces) == 0 { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_others.go |
<mask> // validateDialedHost validated the host used by resolvers in dialFunc.
<mask> func validateDialedHost(host string) (err error) {
<mask> defer func() { err = errors.Annotate(err, "parsing %q: %w", host) }()
<mask>
<mask> var ipStr string
<mask> parts := strings.Split(host, "%")
<mask> switch len(parts) {
<mask> case 1:
<mask> ipStr = host
<mask> case 2:
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove ipStr = host
</s> add // host </s> remove ipStr = parts[0]
</s> add host = parts[0] </s> remove _, err := NewSystemResolvers(0, func() string {
</s> add _, err := NewSystemResolvers(func() string { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_others.go |
|
// host | <mask> var ipStr string
<mask> parts := strings.Split(host, "%")
<mask> switch len(parts) {
<mask> case 1:
<mask> ipStr = host
<mask> case 2:
<mask> // Remove the zone and check the IP address part.
<mask> ipStr = parts[0]
<mask> default:
<mask> return errUnexpectedHostFormat
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove ipStr = parts[0]
</s> add host = parts[0] </s> remove var ipStr string
</s> add </s> remove if net.ParseIP(ipStr) == nil {
</s> add if _, err = netutil.ParseIP(host); err != nil { </s> remove // writeRules writes the actual rule for the qtype and the PTR for the
// host-ip pair into internal builders.
</s> add // writeRules writes the actual rule for the qtype and the PTR for the host-ip
// pair into internal builders. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_others.go |
host = parts[0] | <mask> case 1:
<mask> ipStr = host
<mask> case 2:
<mask> // Remove the zone and check the IP address part.
<mask> ipStr = parts[0]
<mask> default:
<mask> return errUnexpectedHostFormat
<mask> }
<mask>
<mask> if net.ParseIP(ipStr) == nil {
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove ipStr = host
</s> add // host </s> remove var ipStr string
</s> add </s> remove if net.ParseIP(ipStr) == nil {
</s> add if _, err = netutil.ParseIP(host); err != nil { </s> remove // writeRules writes the actual rule for the qtype and the PTR for the
// host-ip pair into internal builders.
</s> add // writeRules writes the actual rule for the qtype and the PTR for the host-ip
// pair into internal builders. </s> remove }
if len(ifaces) == 0 {
</s> add } else if len(ifaces) == 0 { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_others.go |
if _, err = netutil.ParseIP(host); err != nil { | <mask> default:
<mask> return errUnexpectedHostFormat
<mask> }
<mask>
<mask> if net.ParseIP(ipStr) == nil {
<mask> return errBadAddrPassed
<mask> }
<mask>
<mask> return nil
<mask> }
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove ipStr = parts[0]
</s> add host = parts[0] </s> remove }
if len(ifaces) == 0 {
</s> add } else if len(ifaces) == 0 { </s> remove func newSystemResolvers(refreshIvl time.Duration, hostGenFunc HostGenFunc) (sr SystemResolvers) {
</s> add func newSystemResolvers(hostGenFunc HostGenFunc) (sr SystemResolvers) { </s> remove if refreshIvl > 0 {
ticker := time.NewTicker(refreshIvl)
go refreshWithTicker(sr, ticker.C)
}
</s> add </s> remove ipStr = host
</s> add // host | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_others.go |
<mask>
<mask> import (
<mask> "context"
<mask> "testing"
<mask> "time"
<mask>
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove "time"
</s> add </s> remove import (
"time"
"github.com/AdguardTeam/golibs/log"
)
</s> add </s> remove func createTestSystemResolversImp(
</s> add func createTestSystemResolversImpl( | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_others_test.go |
|
func createTestSystemResolversImpl( | <mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> func createTestSystemResolversImp(
<mask> t *testing.T,
<mask> refreshDur time.Duration,
<mask> hostGenFunc HostGenFunc,
<mask> ) (imp *systemResolvers) {
<mask> t.Helper()
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove refreshDur time.Duration,
</s> add </s> remove refreshDur time.Duration,
</s> add </s> remove sr := createTestSystemResolvers(t, refreshDur, hostGenFunc)
</s> add sr := createTestSystemResolvers(t, hostGenFunc)
require.IsType(t, (*systemResolvers)(nil), sr) </s> remove "time"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_others_test.go |
<mask> )
<mask>
<mask> func createTestSystemResolversImp(
<mask> t *testing.T,
<mask> refreshDur time.Duration,
<mask> hostGenFunc HostGenFunc,
<mask> ) (imp *systemResolvers) {
<mask> t.Helper()
<mask>
<mask> sr := createTestSystemResolvers(t, refreshDur, hostGenFunc)
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove func createTestSystemResolversImp(
</s> add func createTestSystemResolversImpl( </s> remove sr := createTestSystemResolvers(t, refreshDur, hostGenFunc)
</s> add sr := createTestSystemResolvers(t, hostGenFunc)
require.IsType(t, (*systemResolvers)(nil), sr) </s> remove refreshDur time.Duration,
</s> add </s> remove var ok bool
imp, ok = sr.(*systemResolvers)
require.True(t, ok)
return imp
</s> add return sr.(*systemResolvers) </s> remove sr = newSystemResolvers(refreshIvl, hostGenFunc)
</s> add sr = newSystemResolvers(hostGenFunc) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_others_test.go |
|
sr := createTestSystemResolvers(t, hostGenFunc)
require.IsType(t, (*systemResolvers)(nil), sr) | <mask> hostGenFunc HostGenFunc,
<mask> ) (imp *systemResolvers) {
<mask> t.Helper()
<mask>
<mask> sr := createTestSystemResolvers(t, refreshDur, hostGenFunc)
<mask>
<mask> var ok bool
<mask> imp, ok = sr.(*systemResolvers)
<mask> require.True(t, ok)
<mask>
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove var ok bool
imp, ok = sr.(*systemResolvers)
require.True(t, ok)
return imp
</s> add return sr.(*systemResolvers) </s> remove refreshDur time.Duration,
</s> add </s> remove func createTestSystemResolversImp(
</s> add func createTestSystemResolversImpl( </s> remove refreshDur time.Duration,
</s> add </s> remove sr = newSystemResolvers(refreshIvl, hostGenFunc)
</s> add sr = newSystemResolvers(hostGenFunc) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_others_test.go |
return sr.(*systemResolvers) | <mask> t.Helper()
<mask>
<mask> sr := createTestSystemResolvers(t, refreshDur, hostGenFunc)
<mask>
<mask> var ok bool
<mask> imp, ok = sr.(*systemResolvers)
<mask> require.True(t, ok)
<mask>
<mask> return imp
<mask> }
<mask>
<mask> func TestSystemResolvers_Refresh(t *testing.T) {
<mask> t.Run("expected_error", func(t *testing.T) {
<mask> sr := createTestSystemResolvers(t, 0, nil)
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove sr := createTestSystemResolvers(t, refreshDur, hostGenFunc)
</s> add sr := createTestSystemResolvers(t, hostGenFunc)
require.IsType(t, (*systemResolvers)(nil), sr) </s> remove sr := createTestSystemResolvers(t, 0, nil)
</s> add sr := createTestSystemResolvers(t, nil) </s> remove sr := createTestSystemResolvers(t, 0, nil)
assert.NotEmpty(t, sr.Get())
</s> add sr := createTestSystemResolvers(t, nil)
var rs []string
require.NotPanics(t, func() {
rs = sr.Get()
})
assert.NotEmpty(t, rs) </s> remove refreshDur time.Duration,
</s> add </s> remove imp := createTestSystemResolversImp(t, 0, nil)
</s> add imp := createTestSystemResolversImpl(t, nil) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_others_test.go |
sr := createTestSystemResolvers(t, nil) | <mask> }
<mask>
<mask> func TestSystemResolvers_Refresh(t *testing.T) {
<mask> t.Run("expected_error", func(t *testing.T) {
<mask> sr := createTestSystemResolvers(t, 0, nil)
<mask>
<mask> assert.NoError(t, sr.refresh())
<mask> })
<mask>
<mask> t.Run("unexpected_error", func(t *testing.T) {
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove var ok bool
imp, ok = sr.(*systemResolvers)
require.True(t, ok)
return imp
</s> add return sr.(*systemResolvers) </s> remove _, err := NewSystemResolvers(0, func() string {
</s> add _, err := NewSystemResolvers(func() string { </s> remove sr := createTestSystemResolvers(t, 0, nil)
assert.NotEmpty(t, sr.Get())
</s> add sr := createTestSystemResolvers(t, nil)
var rs []string
require.NotPanics(t, func() {
rs = sr.Get()
})
assert.NotEmpty(t, rs) </s> remove imp := createTestSystemResolversImp(t, 0, nil)
</s> add imp := createTestSystemResolversImpl(t, nil) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_others_test.go |
_, err := NewSystemResolvers(func() string { | <mask> assert.NoError(t, sr.refresh())
<mask> })
<mask>
<mask> t.Run("unexpected_error", func(t *testing.T) {
<mask> _, err := NewSystemResolvers(0, func() string {
<mask> return "127.0.0.1::123"
<mask> })
<mask> assert.Error(t, err)
<mask> })
<mask> }
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove sr := createTestSystemResolvers(t, 0, nil)
</s> add sr := createTestSystemResolvers(t, nil) </s> remove imp := createTestSystemResolversImp(t, 0, nil)
</s> add imp := createTestSystemResolversImpl(t, nil) </s> remove sr := createTestSystemResolvers(t, 0, nil)
assert.NotEmpty(t, sr.Get())
</s> add sr := createTestSystemResolvers(t, nil)
var rs []string
require.NotPanics(t, func() {
rs = sr.Get()
})
assert.NotEmpty(t, rs) </s> remove var ok bool
imp, ok = sr.(*systemResolvers)
require.True(t, ok)
return imp
</s> add return sr.(*systemResolvers) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_others_test.go |
imp := createTestSystemResolversImpl(t, nil) | <mask> })
<mask> }
<mask>
<mask> func TestSystemResolvers_DialFunc(t *testing.T) {
<mask> imp := createTestSystemResolversImp(t, 0, nil)
<mask>
<mask> testCases := []struct {
<mask> want error
<mask> name string
<mask> address string
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove _, err := NewSystemResolvers(0, func() string {
</s> add _, err := NewSystemResolvers(func() string { </s> remove sr := createTestSystemResolvers(t, 0, nil)
</s> add sr := createTestSystemResolvers(t, nil) </s> remove var ok bool
imp, ok = sr.(*systemResolvers)
require.True(t, ok)
return imp
</s> add return sr.(*systemResolvers) </s> remove name: "valid",
</s> add name: "valid_ipv4", </s> remove sr := createTestSystemResolvers(t, 0, nil)
assert.NotEmpty(t, sr.Get())
</s> add sr := createTestSystemResolvers(t, nil)
var rs []string
require.NotPanics(t, func() {
rs = sr.Get()
})
assert.NotEmpty(t, rs) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_others_test.go |
name: "valid_ipv4", | <mask> name string
<mask> address string
<mask> }{{
<mask> want: errFakeDial,
<mask> name: "valid",
<mask> address: "127.0.0.1",
<mask> }, {
<mask> want: errFakeDial,
<mask> name: "valid_ipv6_port",
<mask> address: "[::1]:53",
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove imp := createTestSystemResolversImp(t, 0, nil)
</s> add imp := createTestSystemResolversImpl(t, nil) </s> remove _, err := NewSystemResolvers(0, func() string {
</s> add _, err := NewSystemResolvers(func() string { </s> remove ipStr = host
</s> add // host </s> remove var ipStr string
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_others_test.go |
<mask> package aghnet
<mask>
<mask> import (
<mask> "testing"
<mask> "time"
<mask>
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove "time"
</s> add </s> remove import (
"time"
"github.com/AdguardTeam/golibs/log"
)
</s> add </s> remove func createTestSystemResolversImp(
</s> add func createTestSystemResolversImpl( | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_test.go |
|
<mask> )
<mask>
<mask> func createTestSystemResolvers(
<mask> t *testing.T,
<mask> refreshDur time.Duration,
<mask> hostGenFunc HostGenFunc,
<mask> ) (sr SystemResolvers) {
<mask> t.Helper()
<mask>
<mask> var err error
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove func createTestSystemResolversImp(
</s> add func createTestSystemResolversImpl( </s> remove refreshDur time.Duration,
</s> add </s> remove sr, err = NewSystemResolvers(refreshDur, hostGenFunc)
</s> add sr, err = NewSystemResolvers(hostGenFunc) </s> remove func newSystemResolvers(refreshIvl time.Duration, hostGenFunc HostGenFunc) (sr SystemResolvers) {
</s> add func newSystemResolvers(hostGenFunc HostGenFunc) (sr SystemResolvers) { </s> remove sr = newSystemResolvers(refreshIvl, hostGenFunc)
</s> add sr = newSystemResolvers(hostGenFunc) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_test.go |
|
sr, err = NewSystemResolvers(hostGenFunc) | <mask> ) (sr SystemResolvers) {
<mask> t.Helper()
<mask>
<mask> var err error
<mask> sr, err = NewSystemResolvers(refreshDur, hostGenFunc)
<mask> require.NoError(t, err)
<mask> require.NotNil(t, sr)
<mask>
<mask> return sr
<mask> }
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove refreshDur time.Duration,
</s> add </s> remove sr := createTestSystemResolvers(t, refreshDur, hostGenFunc)
</s> add sr := createTestSystemResolvers(t, hostGenFunc)
require.IsType(t, (*systemResolvers)(nil), sr) </s> remove sr = newSystemResolvers(refreshIvl, hostGenFunc)
</s> add sr = newSystemResolvers(hostGenFunc) </s> remove func newSystemResolvers(refreshIvl time.Duration, hostGenFunc HostGenFunc) (sr SystemResolvers) {
</s> add func newSystemResolvers(hostGenFunc HostGenFunc) (sr SystemResolvers) { </s> remove var ok bool
imp, ok = sr.(*systemResolvers)
require.True(t, ok)
return imp
</s> add return sr.(*systemResolvers) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_test.go |
sr := createTestSystemResolvers(t, nil)
var rs []string
require.NotPanics(t, func() {
rs = sr.Get()
})
assert.NotEmpty(t, rs) | <mask> return sr
<mask> }
<mask>
<mask> func TestSystemResolvers_Get(t *testing.T) {
<mask> sr := createTestSystemResolvers(t, 0, nil)
<mask> assert.NotEmpty(t, sr.Get())
<mask> }
<mask>
<mask> // TODO(e.burkov): Write tests for refreshWithTicker.
<mask> //
<mask> // See https://github.com/AdguardTeam/AdGuardHome/issues/2846.
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove sr := createTestSystemResolvers(t, 0, nil)
</s> add sr := createTestSystemResolvers(t, nil) </s> remove var ok bool
imp, ok = sr.(*systemResolvers)
require.True(t, ok)
return imp
</s> add return sr.(*systemResolvers) </s> remove imp := createTestSystemResolversImp(t, 0, nil)
</s> add imp := createTestSystemResolversImpl(t, nil) </s> remove sr := createTestSystemResolvers(t, refreshDur, hostGenFunc)
</s> add sr := createTestSystemResolvers(t, hostGenFunc)
require.IsType(t, (*systemResolvers)(nil), sr) </s> remove // refreshWithTicker refreshes the cache of sr after each tick form tickCh.
func refreshWithTicker(sr SystemResolvers, tickCh <-chan time.Time) {
defer log.OnPanic("systemResolvers")
// TODO(e.burkov): Implement a functionality to stop ticker.
for range tickCh {
err := sr.refresh()
if err != nil {
log.Error("systemResolvers: error in refreshing goroutine: %s", err)
continue
}
log.Debug("systemResolvers: local addresses cache is refreshed")
}
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_test.go |
<mask> "net"
<mask> "os/exec"
<mask> "strings"
<mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
</s> Pull request: 2846 cover aghnet vol.2
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.2 to master
Updates #2846.
Closes #4408.
Squashed commit of the following:
commit 8d62b29d5b5be875cb71e518e479e321d853eb1a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:42:04 2022 +0300
home: recover panic
commit 1d98109e910830bec712c7aecbbbcb8f659d823d
Merge: ac11d751 9ce2a0fb
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:32:05 2022 +0300
Merge branch 'master' into 2846-cover-aghnet-vol.2
commit ac11d751fb7951e3dd0940bf425a893223c32789
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:29:41 2022 +0300
aghnet: use iotest
commit 7c923df7bafd5d4b91c4b4a01e75ab161944f949
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 20:17:19 2022 +0300
aghnet: cover more
commit 3bfd4d587e4b887b5527d60c0eb6027da15c7e37
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 14:13:59 2022 +0300
aghnet: cover arpdb more
commit cd5cf7bbdecceeab6d3abee10a5572e1e907cc67
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 13:05:35 2022 +0300
all: rm arpdb initial refresh
commit 0fb8d9e44a4d130ca4e8fc2ea5d595ec08555302
Author: Eugene Burkov <[email protected]>
Date: Tue Mar 22 21:13:16 2022 +0300
aghnet: cover arpdb </s> remove import (
"time"
"github.com/AdguardTeam/golibs/log"
)
</s> add </s> remove "time"
</s> add </s> remove "time"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/82505566f87fe10b80b2961456ed0150baed716c | internal/aghnet/systemresolvers_windows.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.