docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
assert.Equal(t, dns.RcodeRefused, reply.Rcode) | <mask> // response is blocked
<mask> req = createTestMessage("example.org.")
<mask> reply, err = dns.Exchange(req, addr.String())
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, dns.RcodeNameError, reply.Rcode)
<mask>
<mask> _ = s.Stop()
<mask> }
<mask>
<mask> func TestClientRulesForCNAMEMatching(t *testing.T) {
</s> * DNS: use REFUSED DNS error code as the default blocking method </s> remove assert.Equal(t, dns.RcodeNameError, reply.Rcode)
</s> add assert.Equal(t, dns.RcodeRefused, reply.Rcode) </s> remove if reply.Rcode != dns.RcodeNameError {
t.Fatalf("Wrong response: %s", reply.String())
}
</s> add assert.Equal(t, dns.RcodeRefused, reply.Rcode) </s> remove // NXDomain blocking
</s> add // Default blocking - REFUSED </s> remove d.Res = s.genNXDomain(d.Req)
</s> add d.Res = s.makeResponseREFUSED(d.Req) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8f017d2c0e25969bd86eafa4adbc184e41c61dc0 | dnsforward/dnsforward_test.go |
d.Res = s.makeResponseREFUSED(d.Req) | <mask>
<mask> // disable Mozilla DoH
<mask> if (d.Req.Question[0].Qtype == dns.TypeA || d.Req.Question[0].Qtype == dns.TypeAAAA) &&
<mask> d.Req.Question[0].Name == "use-application-dns.net." {
<mask> d.Res = s.genNXDomain(d.Req)
<mask> return resultFinish
<mask> }
<mask>
<mask> return resultDone
<mask> }
</s> * DNS: use REFUSED DNS error code as the default blocking method </s> remove return s.genNXDomain(m)
</s> add return s.makeResponseREFUSED(m) </s> remove return s.genNXDomain(m)
</s> add return s.makeResponseREFUSED(m) </s> remove // If there is no IP, return NXDOMAIN
</s> add // If there is no IP, return REFUSED </s> remove if reply.Rcode != dns.RcodeNameError {
t.Fatalf("Wrong response: %s", reply.String())
}
</s> add assert.Equal(t, dns.RcodeRefused, reply.Rcode) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8f017d2c0e25969bd86eafa4adbc184e41c61dc0 | dnsforward/handle_dns.go |
return s.makeResponseREFUSED(m) | <mask> func (s *Server) genDNSFilterMessage(d *proxy.DNSContext, result *dnsfilter.Result) *dns.Msg {
<mask> m := d.Req
<mask>
<mask> if m.Question[0].Qtype != dns.TypeA && m.Question[0].Qtype != dns.TypeAAAA {
<mask> return s.genNXDomain(m)
<mask> }
<mask>
<mask> switch result.Reason {
<mask> case dnsfilter.FilteredSafeBrowsing:
<mask> return s.genBlockedHost(m, s.conf.SafeBrowsingBlockHost, d)
</s> * DNS: use REFUSED DNS error code as the default blocking method </s> remove return s.genNXDomain(m)
</s> add return s.makeResponseREFUSED(m) </s> remove d.Res = s.genNXDomain(d.Req)
</s> add d.Res = s.makeResponseREFUSED(d.Req) </s> remove // If there is no IP, return NXDOMAIN
</s> add // If there is no IP, return REFUSED </s> remove if reply.Rcode != dns.RcodeNameError {
t.Fatalf("Wrong response: %s", reply.String())
}
</s> add assert.Equal(t, dns.RcodeRefused, reply.Rcode) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8f017d2c0e25969bd86eafa4adbc184e41c61dc0 | dnsforward/msg.go |
// If there is no IP, return REFUSED | <mask> }
<mask>
<mask> // Default blocking mode
<mask> // If there's an IP specified in the rule, return it
<mask> // If there is no IP, return NXDOMAIN
<mask> if result.IP != nil {
<mask> return s.genResponseWithIP(m, result.IP)
<mask> }
<mask> return s.genNXDomain(m)
<mask> }
</s> * DNS: use REFUSED DNS error code as the default blocking method </s> remove return s.genNXDomain(m)
</s> add return s.makeResponseREFUSED(m) </s> remove // NXDomain blocking
</s> add // Default blocking - REFUSED </s> remove d.Res = s.genNXDomain(d.Req)
</s> add d.Res = s.makeResponseREFUSED(d.Req) </s> remove return s.genNXDomain(m)
</s> add return s.makeResponseREFUSED(m) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8f017d2c0e25969bd86eafa4adbc184e41c61dc0 | dnsforward/msg.go |
return s.makeResponseREFUSED(m) | <mask> // If there is no IP, return NXDOMAIN
<mask> if result.IP != nil {
<mask> return s.genResponseWithIP(m, result.IP)
<mask> }
<mask> return s.genNXDomain(m)
<mask> }
<mask> }
<mask>
<mask> func (s *Server) genServerFailure(request *dns.Msg) *dns.Msg {
<mask> resp := dns.Msg{}
</s> * DNS: use REFUSED DNS error code as the default blocking method </s> remove // If there is no IP, return NXDOMAIN
</s> add // If there is no IP, return REFUSED </s> remove return s.genNXDomain(m)
</s> add return s.makeResponseREFUSED(m) </s> remove d.Res = s.genNXDomain(d.Req)
</s> add d.Res = s.makeResponseREFUSED(d.Req) </s> remove if reply.Rcode != dns.RcodeNameError {
t.Fatalf("Wrong response: %s", reply.String())
}
</s> add assert.Equal(t, dns.RcodeRefused, reply.Rcode) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8f017d2c0e25969bd86eafa4adbc184e41c61dc0 | dnsforward/msg.go |
// Create REFUSED DNS response
func (s *Server) makeResponseREFUSED(request *dns.Msg) *dns.Msg {
resp := dns.Msg{}
resp.SetRcode(request, dns.RcodeRefused)
resp.RecursionAvailable = true
return &resp
}
| <mask> answer.Target = dns.Fqdn(cname)
<mask> return answer
<mask> }
<mask>
<mask> func (s *Server) genNXDomain(request *dns.Msg) *dns.Msg {
<mask> resp := dns.Msg{}
<mask> resp.SetRcode(request, dns.RcodeNameError)
<mask> resp.RecursionAvailable = true
<mask> resp.Ns = s.genSOA(request)
</s> * DNS: use REFUSED DNS error code as the default blocking method </s> remove return s.genNXDomain(m)
</s> add return s.makeResponseREFUSED(m) </s> remove // NXDomain blocking
</s> add // Default blocking - REFUSED </s> remove return s.genNXDomain(m)
</s> add return s.makeResponseREFUSED(m) </s> remove d.Res = s.genNXDomain(d.Req)
</s> add d.Res = s.makeResponseREFUSED(d.Req) </s> remove assert.Equal(t, dns.RcodeNameError, reply.Rcode)
</s> add assert.Equal(t, dns.RcodeRefused, reply.Rcode) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8f017d2c0e25969bd86eafa4adbc184e41c61dc0 | dnsforward/msg.go |
type clientObject struct {
Name string `yaml:"name"`
IP string `yaml:"ip"`
MAC string `yaml:"mac"`
UseGlobalSettings bool `yaml:"use_global_settings"`
FilteringEnabled bool `yaml:"filtering_enabled"`
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safebrowsing_enabled"`
SafeBrowsingEnabled bool `yaml:"safesearch_enabled"`
}
| <mask> }
<mask>
<mask> // configuration is loaded from YAML
<mask> // field ordering is important -- yaml fields will mirror ordering from here
<mask> type configuration struct {
<mask> // Raw file data to avoid re-reading of configuration file
<mask> // It's reset after config is parsed
<mask> fileData []byte
</s> + clients: config: save/restore clients info array | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8f7aff93d7297ed93620c53088ce9c70135dae26 | config.go |
// Note: this array is filled only before file read/write and then it's cleared
Clients []clientObject `yaml:"clients"`
| <mask> UserRules []string `yaml:"user_rules"`
<mask> DHCP dhcpd.ServerConfig `yaml:"dhcp"`
<mask>
<mask> logSettings `yaml:",inline"`
<mask>
<mask> sync.RWMutex `yaml:"-"`
<mask>
<mask> SchemaVersion int `yaml:"schema_version"` // keeping last so that users will be less tempted to change it -- used when upgrading between versions
</s> + clients: config: save/restore clients info array | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8f7aff93d7297ed93620c53088ce9c70135dae26 | config.go |
config.Clients = nil | <mask> configFile := config.getConfigFilename()
<mask> log.Debug("Writing YAML file: %s", configFile)
<mask> yamlText, err := yaml.Marshal(&config)
<mask> if err != nil {
<mask> log.Error("Couldn't generate YAML file: %s", err)
<mask> return err
<mask> }
</s> + clients: config: save/restore clients info array | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8f7aff93d7297ed93620c53088ce9c70135dae26 | config.go |
"time" | <mask> "encoding/json"
<mask> "net"
<mask> "net/http"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dhcpd"
<mask> "github.com/joomcode/errorx"
<mask> )
<mask>
<mask> var dhcpServer = dhcpd.Server{}
</s> Pretty-format leases so it shows human readable MAC address. </s> remove "leases": dhcpServer.Leases(),
</s> add "leases": leases, | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fc5aebf1265b343fe76cdaf1973ac5a3784b498 | dhcp.go |
rawLeases := dhcpServer.Leases()
leases := []map[string]string{}
for i := range rawLeases {
lease := map[string]string{
"mac": rawLeases[i].HWAddr.String(),
"ip": rawLeases[i].IP.String(),
"expires": rawLeases[i].Expiry.Format(time.RFC3339),
}
leases = append(leases, lease)
} | <mask> var dhcpServer = dhcpd.Server{}
<mask>
<mask> func handleDHCPStatus(w http.ResponseWriter, r *http.Request) {
<mask> status := map[string]interface{}{
<mask> "config": config.DHCP,
<mask> "leases": leases,
<mask> }
</s> Pretty-format leases so it shows human readable MAC address. </s> remove "leases": dhcpServer.Leases(),
</s> add "leases": leases, | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fc5aebf1265b343fe76cdaf1973ac5a3784b498 | dhcp.go |
"leases": leases, | <mask>
<mask> func handleDHCPStatus(w http.ResponseWriter, r *http.Request) {
<mask> status := map[string]interface{}{
<mask> "config": config.DHCP,
<mask> "leases": dhcpServer.Leases(),
<mask> }
<mask>
<mask> w.Header().Set("Content-Type", "application/json")
<mask> err := json.NewEncoder(w).Encode(status)
<mask> if err != nil {
</s> Pretty-format leases so it shows human readable MAC address. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fc5aebf1265b343fe76cdaf1973ac5a3784b498 | dhcp.go |
<mask> // --
<mask>
<mask> configFilename string // Config filename (can be overridden via the command line arguments)
<mask> workDir string // Location of our directory, used to protect against CWD being somewhere else
<mask> firstRun bool // if set to true, don't run any services except HTTP web interface, and serve only first-run html
<mask> pidFileName string // PID file name. Empty if no PID file was created.
<mask> disableUpdate bool // If set, don't check for updates
<mask> controlLock sync.Mutex
<mask> tlsRoots *x509.CertPool // list of root CAs for TLSv1.2
<mask> transport *http.Transport
</s> Pull request: imp-pprof
Merge in DNS/adguard-home from imp-pprof to master
Squashed commit of the following:
commit cd6c2ec15342ef55957ab65e1599733c2ee57b7b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Nov 7 19:45:12 2022 +0300
home: imp pprof handling, field alignment </s> remove disableUpdate bool // If set, don't check for updates
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdbcc005cc1cff80bff7360a55e838e2458fb2f | internal/home/home.go | |
<mask> configFilename string // Config filename (can be overridden via the command line arguments)
<mask> workDir string // Location of our directory, used to protect against CWD being somewhere else
<mask> firstRun bool // if set to true, don't run any services except HTTP web interface, and serve only first-run html
<mask> pidFileName string // PID file name. Empty if no PID file was created.
<mask> disableUpdate bool // If set, don't check for updates
<mask> controlLock sync.Mutex
<mask> tlsRoots *x509.CertPool // list of root CAs for TLSv1.2
<mask> transport *http.Transport
<mask> client *http.Client
<mask> appSignalChannel chan os.Signal // Channel for receiving OS signals by the console app
</s> Pull request: imp-pprof
Merge in DNS/adguard-home from imp-pprof to master
Squashed commit of the following:
commit cd6c2ec15342ef55957ab65e1599733c2ee57b7b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Nov 7 19:45:12 2022 +0300
home: imp pprof handling, field alignment </s> remove firstRun bool // if set to true, don't run any services except HTTP web interface, and serve only first-run html
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdbcc005cc1cff80bff7360a55e838e2458fb2f | internal/home/home.go | |
// disableUpdate, if true, tells AdGuard Home to not check for updates.
disableUpdate bool
// firstRun, if true, tells AdGuard Home to only start the web interface
// service, and only serve the first-run APIs.
firstRun bool
| <mask>
<mask> // tlsCipherIDs are the ID of the cipher suites that AdGuard Home must use.
<mask> tlsCipherIDs []uint16
<mask>
<mask> // runningAsService flag is set to true when options are passed from the service runner
<mask> runningAsService bool
<mask> }
<mask>
<mask> // getDataDir returns path to the directory where we store databases and filters
</s> Pull request: imp-pprof
Merge in DNS/adguard-home from imp-pprof to master
Squashed commit of the following:
commit cd6c2ec15342ef55957ab65e1599733c2ee57b7b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Nov 7 19:45:12 2022 +0300
home: imp pprof handling, field alignment </s> remove disableUpdate bool // If set, don't check for updates
</s> add </s> remove firstRun bool // if set to true, don't run any services except HTTP web interface, and serve only first-run html
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdbcc005cc1cff80bff7360a55e838e2458fb2f | internal/home/home.go |
// See profileSupportsDelta in src/net/http/pprof/pprof.go.
mux.Handle("/debug/pprof/allocs", pprof.Handler("allocs"))
mux.Handle("/debug/pprof/block", pprof.Handler("block"))
mux.Handle("/debug/pprof/goroutine", pprof.Handler("goroutine"))
mux.Handle("/debug/pprof/heap", pprof.Handler("heap"))
mux.Handle("/debug/pprof/mutex", pprof.Handler("mutex"))
mux.Handle("/debug/pprof/threadcreate", pprof.Handler("threadcreate"))
| <mask> mux.HandleFunc("/debug/pprof/profile", pprof.Profile)
<mask> mux.HandleFunc("/debug/pprof/symbol", pprof.Symbol)
<mask> mux.HandleFunc("/debug/pprof/trace", pprof.Trace)
<mask> go func() {
<mask> log.Info("pprof: listening on localhost:6060")
<mask> lerr := http.ListenAndServe("localhost:6060", mux)
<mask> log.Error("Error while running the pprof server: %s", lerr)
</s> Pull request: imp-pprof
Merge in DNS/adguard-home from imp-pprof to master
Squashed commit of the following:
commit cd6c2ec15342ef55957ab65e1599733c2ee57b7b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Mon Nov 7 19:45:12 2022 +0300
home: imp pprof handling, field alignment </s> remove disableUpdate bool // If set, don't check for updates
</s> add </s> remove firstRun bool // if set to true, don't run any services except HTTP web interface, and serve only first-run html
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdbcc005cc1cff80bff7360a55e838e2458fb2f | internal/home/home.go |
"filter_allowlist": "WARNING: This action also will exclude the rule \"{{disallowed_rule}}\" from the list of allowed clients.",
"last_rule_in_allowlist": "Cannot disallow this client because excluding the rule \"{{disallowed_rule}}\" will DISABLE \"Allowed clients\" list.", | <mask> "original_response": "Original response",
<mask> "click_to_view_queries": "Click to view queries",
<mask> "port_53_faq_link": "Port 53 is often occupied by \"DNSStubListener\" or \"systemd-resolved\" services. Please read <0>this instruction</0> on how to resolve this.",
<mask> "adg_will_drop_dns_queries": "AdGuard Home will be dropping all DNS queries from this client.",
<mask> "client_not_in_allowed_clients": "The client is not allowed because it is not in the \"Allowed clients\" list.",
<mask> "experimental": "Experimental",
<mask> "use_saved_key": "Use the previously saved key"
<mask> }
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove Persistent client's name or an empty string if this is a runtime
client.
</s> add Persistent client's name or runtime client's hostname. </s> remove // findMultiple is a wrapper around Find to make it a valid client finder for
// the query log. err is always nil.
</s> add // findMultiple returns info about client. If no information about the client
// is found, it sends the client by default only with the "Disallowed" field
// filled in. err is always nil. </s> remove var name string
whois := &querylog.ClientWHOIS{}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | client/src/__locales/en.json |
<mask> export const toggleClientBlock = (ip, disallowed, disallowed_rule) => async (dispatch) => {
<mask> dispatch(toggleClientBlockRequest());
<mask> try {
<mask> const accessList = await apiClient.getAccessList();
<mask> const allowed_clients = accessList.allowed_clients ?? [];
<mask> const blocked_hosts = accessList.blocked_hosts ?? [];
<mask> const disallowed_clients = accessList.disallowed_clients ?? [];
<mask>
<mask> const updatedDisallowedClients = disallowed
<mask> ? disallowed_clients.filter((client) => client !== disallowed_rule)
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove const disallowed_clients = accessList.disallowed_clients ?? [];
const updatedDisallowedClients = disallowed
? disallowed_clients.filter((client) => client !== disallowed_rule)
: disallowed_clients.concat(ip);
</s> add let allowed_clients = accessList.allowed_clients ?? [];
let disallowed_clients = accessList.disallowed_clients ?? []; </s> remove const Form = (props) => {
</s> add let Form = (props) => { </s> remove disabled: isNotInAllowedList,
</s> add disabled: processingSet || lastRuleInAllowlist, </s> remove export default flow([withTranslation(), reduxForm({ form: FORM_NAME.ACCESS })])(Form);
</s> add const selector = formValueSelector(FORM_NAME.ACCESS);
Form = connect((state) => {
const allowedClients = selector(state, 'allowed_clients');
return {
allowedClients,
};
})(Form);
export default flow([
withTranslation(),
reduxForm({
form: FORM_NAME.ACCESS,
}),
])(Form); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | client/src/actions/access.js | |
let allowed_clients = accessList.allowed_clients ?? [];
let disallowed_clients = accessList.disallowed_clients ?? []; | <mask> try {
<mask> const accessList = await apiClient.getAccessList();
<mask> const allowed_clients = accessList.allowed_clients ?? [];
<mask> const blocked_hosts = accessList.blocked_hosts ?? [];
<mask> const disallowed_clients = accessList.disallowed_clients ?? [];
<mask>
<mask> const updatedDisallowedClients = disallowed
<mask> ? disallowed_clients.filter((client) => client !== disallowed_rule)
<mask> : disallowed_clients.concat(ip);
<mask>
<mask> const values = {
<mask> allowed_clients,
<mask> blocked_hosts,
<mask> disallowed_clients: updatedDisallowedClients,
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove const allowed_clients = accessList.allowed_clients ?? [];
</s> add </s> remove disallowed_clients: updatedDisallowedClients,
</s> add disallowed_clients, </s> remove const Form = (props) => {
</s> add let Form = (props) => { </s> remove handleSubmit, submitting, invalid, processingSet,
</s> add allowedClients, handleSubmit, submitting, invalid, processingSet, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | client/src/actions/access.js |
if (disallowed) {
if (!disallowed_rule) {
allowed_clients = allowed_clients.concat(ip);
} else {
disallowed_clients = disallowed_clients
.filter((client) => client !== disallowed_rule);
}
} else if (allowed_clients.length > 1) {
allowed_clients = allowed_clients
.filter((client) => client !== disallowed_rule);
} else {
disallowed_clients = disallowed_clients.concat(ip);
} | <mask> let disallowed_clients = accessList.disallowed_clients ?? [];
<mask>
<mask> const values = {
<mask> allowed_clients,
<mask> blocked_hosts,
<mask> disallowed_clients,
<mask> };
<mask>
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove const disallowed_clients = accessList.disallowed_clients ?? [];
const updatedDisallowedClients = disallowed
? disallowed_clients.filter((client) => client !== disallowed_rule)
: disallowed_clients.concat(ip);
</s> add let allowed_clients = accessList.allowed_clients ?? [];
let disallowed_clients = accessList.disallowed_clients ?? []; </s> remove disallowed_clients: updatedDisallowedClients,
</s> add disallowed_clients, </s> remove const allowed_clients = accessList.allowed_clients ?? [];
</s> add </s> remove const Form = (props) => {
</s> add let Form = (props) => { </s> remove export default flow([withTranslation(), reduxForm({ form: FORM_NAME.ACCESS })])(Form);
</s> add const selector = formValueSelector(FORM_NAME.ACCESS);
Form = connect((state) => {
const allowedClients = selector(state, 'allowed_clients');
return {
allowedClients,
};
})(Form);
export default flow([
withTranslation(),
reduxForm({
form: FORM_NAME.ACCESS,
}),
])(Form); | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | client/src/actions/access.js |
disallowed_clients, | <mask>
<mask> const values = {
<mask> allowed_clients,
<mask> blocked_hosts,
<mask> disallowed_clients: updatedDisallowedClients,
<mask> };
<mask>
<mask> await apiClient.setAccessList(values);
<mask> dispatch(toggleClientBlockSuccess(values));
<mask>
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove const disallowed_clients = accessList.disallowed_clients ?? [];
const updatedDisallowedClients = disallowed
? disallowed_clients.filter((client) => client !== disallowed_rule)
: disallowed_clients.concat(ip);
</s> add let allowed_clients = accessList.allowed_clients ?? [];
let disallowed_clients = accessList.disallowed_clients ?? []; </s> remove dispatch(addSuccessToast(i18next.t('client_unblocked', { ip: disallowed_rule })));
</s> add dispatch(addSuccessToast(i18next.t('client_unblocked', { ip: disallowed_rule || ip }))); </s> remove export default flow([withTranslation(), reduxForm({ form: FORM_NAME.ACCESS })])(Form);
</s> add const selector = formValueSelector(FORM_NAME.ACCESS);
Form = connect((state) => {
const allowedClients = selector(state, 'allowed_clients');
return {
allowedClients,
};
})(Form);
export default flow([
withTranslation(),
reduxForm({
form: FORM_NAME.ACCESS,
}),
])(Form); </s> remove {fields.map(renderField)}
</s> add {
fields.map((f) => {
const props = { ...f };
if (allowedClients && f.id === 'disallowed_clients') {
props.disabled = true;
}
return renderField(props);
})
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | client/src/actions/access.js |
dispatch(addSuccessToast(i18next.t('client_unblocked', { ip: disallowed_rule || ip }))); | <mask> await apiClient.setAccessList(values);
<mask> dispatch(toggleClientBlockSuccess(values));
<mask>
<mask> if (disallowed) {
<mask> dispatch(addSuccessToast(i18next.t('client_unblocked', { ip: disallowed_rule })));
<mask> } else {
<mask> dispatch(addSuccessToast(i18next.t('client_blocked', { ip })));
<mask> }
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove disallowed_clients: updatedDisallowedClients,
</s> add disallowed_clients, </s> remove c, ok := clients.Find(id)
if ok {
name = c.Name
} else if ip != nil {
var rc *RuntimeClient
rc, ok = clients.FindRuntimeClient(ip)
if !ok {
continue
}
</s> add client := clients.clientInfo(ip, id, disallowed, disallowedRule)
if client.Name == "" && client.DisallowedRule == "" {
emptyClient = client </s> remove }, nil
</s> add }
}
if ip == nil {
return nil
}
var rc *RuntimeClient
rc, ok = clients.FindRuntimeClient(ip)
if ok {
return &querylog.Client{
Name: rc.Host,
DisallowedRule: rule,
WHOIS: toQueryLogWHOIS(rc.WHOISInfo),
Disallowed: disallowed,
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | client/src/actions/access.js |
onClick={onClick}
disabled={disabled}
title={lastRuleInAllowlist ? t('last_rule_in_allowlist', { disallowed_rule }) : ''} | <mask> <div className="table__action pl-4">
<mask> <button
<mask> type="button"
<mask> className={buttonClass}
<mask> onClick={isNotInAllowedList ? undefined : onClick}
<mask> disabled={isNotInAllowedList || processingSet}
<mask> title={t(isNotInAllowedList ? 'client_not_in_allowed_clients' : text)}
<mask> >
<mask> <Trans>{text}</Trans>
<mask> </button>
<mask> </div>
<mask> );
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove const disallowed_clients = accessList.disallowed_clients ?? [];
const updatedDisallowedClients = disallowed
? disallowed_clients.filter((client) => client !== disallowed_rule)
: disallowed_clients.concat(ip);
</s> add let allowed_clients = accessList.allowed_clients ?? [];
let disallowed_clients = accessList.disallowed_clients ?? []; </s> remove disabled={disabled}
</s> add disabled={disabled || processingSet} </s> remove isNotInAllowedList,
</s> add lastRuleInAllowlist, </s> remove isNotInAllowedList,
</s> add lastRuleInAllowlist, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | client/src/components/Dashboard/Clients.js |
lastRuleInAllowlist, | <mask>
<mask> const {
<mask> confirmMessage,
<mask> buttonKey: blockingClientKey,
<mask> isNotInAllowedList,
<mask> } = getBlockClientInfo(
<mask> client,
<mask> client_info?.disallowed || false,
<mask> client_info?.disallowed_rule || '',
<mask> );
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove isNotInAllowedList,
</s> add lastRuleInAllowlist, </s> remove disabled: isNotInAllowedList,
</s> add disabled: processingSet || lastRuleInAllowlist, </s> remove isNotInAllowedList,
</s> add lastRuleInAllowlist, </s> remove disabled={isNotInAllowedList}>
</s> add disabled={processingSet || lastRuleInAllowlist}> </s> remove onClick={isNotInAllowedList ? undefined : onClick}
disabled={isNotInAllowedList || processingSet}
title={t(isNotInAllowedList ? 'client_not_in_allowed_clients' : text)}
</s> add onClick={onClick}
disabled={disabled}
title={lastRuleInAllowlist ? t('last_rule_in_allowlist', { disallowed_rule }) : ''} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | client/src/components/Logs/Cells/ClientCell.js |
disabled: processingSet || lastRuleInAllowlist, | <mask> ));
<mask> await dispatch(updateLogs());
<mask> }
<mask> },
<mask> disabled: isNotInAllowedList,
<mask> },
<mask> ];
<mask>
<mask> const onClick = async () => {
<mask> await dispatch(toggleBlocking(buttonType, domain));
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove const Form = (props) => {
</s> add let Form = (props) => { </s> remove const allowed_clients = accessList.allowed_clients ?? [];
</s> add </s> remove handleSubmit, submitting, invalid, processingSet,
</s> add allowedClients, handleSubmit, submitting, invalid, processingSet, </s> remove disallowed_clients: updatedDisallowedClients,
</s> add disallowed_clients, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | client/src/components/Logs/Cells/ClientCell.js |
lastRuleInAllowlist, | <mask>
<mask> return {
<mask> confirmMessage,
<mask> buttonKey,
<mask> isNotInAllowedList,
<mask> };
<mask> };
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove {fields.map(renderField)}
</s> add {
fields.map((f) => {
const props = { ...f };
if (allowedClients && f.id === 'disallowed_clients') {
props.disabled = true;
}
return renderField(props);
})
} </s> remove isNotInAllowedList,
</s> add lastRuleInAllowlist, </s> remove isNotInAllowedList,
</s> add lastRuleInAllowlist, </s> remove export default flow([withTranslation(), reduxForm({ form: FORM_NAME.ACCESS })])(Form);
</s> add const selector = formValueSelector(FORM_NAME.ACCESS);
Form = connect((state) => {
const allowedClients = selector(state, 'allowed_clients');
return {
allowedClients,
};
})(Form);
export default flow([
withTranslation(),
reduxForm({
form: FORM_NAME.ACCESS,
}),
])(Form); </s> remove disallowed_clients: updatedDisallowedClients,
</s> add disallowed_clients, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | client/src/components/Logs/Cells/helpers/index.js |
lastRuleInAllowlist, | <mask>
<mask> const {
<mask> confirmMessage,
<mask> buttonKey: blockingClientKey,
<mask> isNotInAllowedList,
<mask> } = getBlockClientInfo(
<mask> client,
<mask> client_info?.disallowed || false,
<mask> client_info?.disallowed_rule || '',
<mask> );
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | client/src/components/Logs/Cells/index.js |
disabled={processingSet || lastRuleInAllowlist}> | <mask>
<mask> const blockClientButton = <button
<mask> className='text-center font-weight-bold py-2 button-action--arrow-option'
<mask> onClick={onBlockingClientClick}
<mask> disabled={isNotInAllowedList}>
<mask> {t(blockingClientKey)}
<mask> </button>;
<mask>
<mask> const detailedData = {
<mask> time_table_header: formatTime(time, LONG_TIME_FORMAT),
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove {fields.map(renderField)}
</s> add {
fields.map((f) => {
const props = { ...f };
if (allowedClients && f.id === 'disallowed_clients') {
props.disabled = true;
}
return renderField(props);
})
} </s> remove const Form = (props) => {
</s> add let Form = (props) => { </s> remove const allowed_clients = accessList.allowed_clients ?? [];
</s> add </s> remove const disallowed_clients = accessList.disallowed_clients ?? [];
const updatedDisallowedClients = disallowed
? disallowed_clients.filter((client) => client !== disallowed_rule)
: disallowed_clients.concat(ip);
</s> add let allowed_clients = accessList.allowed_clients ?? [];
let disallowed_clients = accessList.disallowed_clients ?? []; </s> remove handleSubmit, submitting, invalid, processingSet,
</s> add allowedClients, handleSubmit, submitting, invalid, processingSet, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | client/src/components/Logs/Cells/index.js |
import { getAccessList } from '../../actions/access'; | <mask> import { getClients } from '../../actions';
<mask> import { getDnsConfig } from '../../actions/dnsConfig';
<mask> import {
<mask> getLogsConfig,
<mask> resetFilteredLogs,
<mask> setFilteredLogs,
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove import { Field, reduxForm } from 'redux-form';
</s> add import { connect } from 'react-redux';
import { Field, reduxForm, formValueSelector } from 'redux-form'; </s> remove dispatch(addSuccessToast(i18next.t('client_unblocked', { ip: disallowed_rule })));
</s> add dispatch(addSuccessToast(i18next.t('client_unblocked', { ip: disallowed_rule || ip }))); </s> remove {fields.map(renderField)}
</s> add {
fields.map((f) => {
const props = { ...f };
if (allowedClients && f.id === 'disallowed_clients') {
props.disabled = true;
}
return renderField(props);
})
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | client/src/components/Logs/index.js |
dispatch(getAccessList()), | <mask> await Promise.all([
<mask> dispatch(getLogsConfig()),
<mask> dispatch(getDnsConfig()),
<mask> ]);
<mask> } catch (err) {
<mask> console.error(err);
<mask> } finally {
<mask> setIsLoading(false);
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove dispatch(addSuccessToast(i18next.t('client_unblocked', { ip: disallowed_rule })));
</s> add dispatch(addSuccessToast(i18next.t('client_unblocked', { ip: disallowed_rule || ip }))); </s> remove disabled: isNotInAllowedList,
</s> add disabled: processingSet || lastRuleInAllowlist, </s> remove import { Field, reduxForm } from 'redux-form';
</s> add import { connect } from 'react-redux';
import { Field, reduxForm, formValueSelector } from 'redux-form'; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | client/src/components/Logs/index.js |
import { connect } from 'react-redux';
import { Field, reduxForm, formValueSelector } from 'redux-form'; | <mask> import React from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import { Field, reduxForm } from 'redux-form';
<mask> import { Trans, withTranslation } from 'react-i18next';
<mask> import flow from 'lodash/flow';
<mask> import { renderTextareaField } from '../../../../helpers/form';
<mask> import {
<mask> trimMultilineString,
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove "client_not_in_allowed_clients": "The client is not allowed because it is not in the \"Allowed clients\" list.",
</s> add "filter_allowlist": "WARNING: This action also will exclude the rule \"{{disallowed_rule}}\" from the list of allowed clients.",
"last_rule_in_allowlist": "Cannot disallow this client because excluding the rule \"{{disallowed_rule}}\" will DISABLE \"Allowed clients\" list.", </s> remove dispatch(addSuccessToast(i18next.t('client_unblocked', { ip: disallowed_rule })));
</s> add dispatch(addSuccessToast(i18next.t('client_unblocked', { ip: disallowed_rule || ip }))); | [
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | client/src/components/Settings/Dns/Access/Form.js |
let Form = (props) => { | <mask> normalizeOnBlur: removeEmptyLines,
<mask> },
<mask> ];
<mask>
<mask> const Form = (props) => {
<mask> const {
<mask> handleSubmit, submitting, invalid, processingSet,
<mask> } = props;
<mask>
<mask> const renderField = ({
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove handleSubmit, submitting, invalid, processingSet,
</s> add allowedClients, handleSubmit, submitting, invalid, processingSet, </s> remove id, title, subtitle, disabled = processingSet, normalizeOnBlur,
</s> add id, title, subtitle, disabled = false, processingSet, normalizeOnBlur, </s> remove disabled: isNotInAllowedList,
</s> add disabled: processingSet || lastRuleInAllowlist, </s> remove export default flow([withTranslation(), reduxForm({ form: FORM_NAME.ACCESS })])(Form);
</s> add const selector = formValueSelector(FORM_NAME.ACCESS);
Form = connect((state) => {
const allowedClients = selector(state, 'allowed_clients');
return {
allowedClients,
};
})(Form);
export default flow([
withTranslation(),
reduxForm({
form: FORM_NAME.ACCESS,
}),
])(Form); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | client/src/components/Settings/Dns/Access/Form.js |
allowedClients, handleSubmit, submitting, invalid, processingSet, | <mask> ];
<mask>
<mask> const Form = (props) => {
<mask> const {
<mask> handleSubmit, submitting, invalid, processingSet,
<mask> } = props;
<mask>
<mask> const renderField = ({
<mask> id, title, subtitle, disabled = processingSet, normalizeOnBlur,
<mask> }) => <div key={id} className="form__group mb-5">
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove id, title, subtitle, disabled = processingSet, normalizeOnBlur,
</s> add id, title, subtitle, disabled = false, processingSet, normalizeOnBlur, </s> remove const Form = (props) => {
</s> add let Form = (props) => { </s> remove {fields.map(renderField)}
</s> add {
fields.map((f) => {
const props = { ...f };
if (allowedClients && f.id === 'disallowed_clients') {
props.disabled = true;
}
return renderField(props);
})
} </s> remove const allowed_clients = accessList.allowed_clients ?? [];
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | client/src/components/Settings/Dns/Access/Form.js |
id, title, subtitle, disabled = false, processingSet, normalizeOnBlur, | <mask> handleSubmit, submitting, invalid, processingSet,
<mask> } = props;
<mask>
<mask> const renderField = ({
<mask> id, title, subtitle, disabled = processingSet, normalizeOnBlur,
<mask> }) => <div key={id} className="form__group mb-5">
<mask> <label className="form__label form__label--with-desc" htmlFor={id}>
<mask> <Trans>{title}</Trans>
<mask> </label>
<mask> <div className="form__desc form__desc--top">
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove handleSubmit, submitting, invalid, processingSet,
</s> add allowedClients, handleSubmit, submitting, invalid, processingSet, </s> remove const Form = (props) => {
</s> add let Form = (props) => { </s> remove {fields.map(renderField)}
</s> add {
fields.map((f) => {
const props = { ...f };
if (allowedClients && f.id === 'disallowed_clients') {
props.disabled = true;
}
return renderField(props);
})
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | client/src/components/Settings/Dns/Access/Form.js |
{disabled && <>
<span> </span>
(<Trans>disabled</Trans>)
</>} | <mask> <label className="form__label form__label--with-desc" htmlFor={id}>
<mask> <Trans>{title}</Trans>
<mask> </label>
<mask> <div className="form__desc form__desc--top">
<mask> <Trans>{subtitle}</Trans>
<mask> </div>
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove id, title, subtitle, disabled = processingSet, normalizeOnBlur,
</s> add id, title, subtitle, disabled = false, processingSet, normalizeOnBlur, </s> remove onClick={isNotInAllowedList ? undefined : onClick}
disabled={isNotInAllowedList || processingSet}
title={t(isNotInAllowedList ? 'client_not_in_allowed_clients' : text)}
</s> add onClick={onClick}
disabled={disabled}
title={lastRuleInAllowlist ? t('last_rule_in_allowlist', { disallowed_rule }) : ''} </s> remove {fields.map(renderField)}
</s> add {
fields.map((f) => {
const props = { ...f };
if (allowedClients && f.id === 'disallowed_clients') {
props.disabled = true;
}
return renderField(props);
})
} </s> remove handleSubmit, submitting, invalid, processingSet,
</s> add allowedClients, handleSubmit, submitting, invalid, processingSet, </s> remove disallowed_clients: updatedDisallowedClients,
</s> add disallowed_clients, | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | client/src/components/Settings/Dns/Access/Form.js |
disabled={disabled || processingSet} | <mask> name={id}
<mask> component={renderTextareaField}
<mask> type="text"
<mask> className="form-control form-control--textarea font-monospace"
<mask> disabled={disabled}
<mask> normalizeOnBlur={normalizeOnBlur}
<mask> />
<mask> </div>;
<mask>
<mask> renderField.propTypes = {
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove onClick={isNotInAllowedList ? undefined : onClick}
disabled={isNotInAllowedList || processingSet}
title={t(isNotInAllowedList ? 'client_not_in_allowed_clients' : text)}
</s> add onClick={onClick}
disabled={disabled}
title={lastRuleInAllowlist ? t('last_rule_in_allowlist', { disallowed_rule }) : ''} </s> remove const Form = (props) => {
</s> add let Form = (props) => { </s> remove c, ok := clients.Find(id)
if ok {
name = c.Name
} else if ip != nil {
var rc *RuntimeClient
rc, ok = clients.FindRuntimeClient(ip)
if !ok {
continue
}
</s> add client := clients.clientInfo(ip, id, disallowed, disallowedRule)
if client.Name == "" && client.DisallowedRule == "" {
emptyClient = client </s> remove handleSubmit, submitting, invalid, processingSet,
</s> add allowedClients, handleSubmit, submitting, invalid, processingSet, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | client/src/components/Settings/Dns/Access/Form.js |
{
fields.map((f) => {
const props = { ...f };
if (allowedClients && f.id === 'disallowed_clients') {
props.disabled = true;
}
return renderField(props);
})
} | <mask> };
<mask>
<mask> return (
<mask> <form onSubmit={handleSubmit}>
<mask> {fields.map(renderField)}
<mask> <div className="card-actions">
<mask> <div className="btn-list">
<mask> <button
<mask> type="submit"
<mask> className="btn btn-success btn-standard"
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove onClick={isNotInAllowedList ? undefined : onClick}
disabled={isNotInAllowedList || processingSet}
title={t(isNotInAllowedList ? 'client_not_in_allowed_clients' : text)}
</s> add onClick={onClick}
disabled={disabled}
title={lastRuleInAllowlist ? t('last_rule_in_allowlist', { disallowed_rule }) : ''} </s> remove id, title, subtitle, disabled = processingSet, normalizeOnBlur,
</s> add id, title, subtitle, disabled = false, processingSet, normalizeOnBlur, </s> remove isNotInAllowedList,
</s> add lastRuleInAllowlist, </s> remove handleSubmit, submitting, invalid, processingSet,
</s> add allowedClients, handleSubmit, submitting, invalid, processingSet, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | client/src/components/Settings/Dns/Access/Form.js |
allowedClients: PropTypes.string, | <mask> processingSet: PropTypes.bool.isRequired,
<mask> t: PropTypes.func.isRequired,
<mask> textarea: PropTypes.bool,
<mask> };
<mask>
<mask> const selector = formValueSelector(FORM_NAME.ACCESS);
<mask>
<mask> Form = connect((state) => {
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove export default flow([withTranslation(), reduxForm({ form: FORM_NAME.ACCESS })])(Form);
</s> add const selector = formValueSelector(FORM_NAME.ACCESS);
Form = connect((state) => {
const allowedClients = selector(state, 'allowed_clients');
return {
allowedClients,
};
})(Form);
export default flow([
withTranslation(),
reduxForm({
form: FORM_NAME.ACCESS,
}),
])(Form); </s> remove const Form = (props) => {
</s> add let Form = (props) => { </s> remove handleSubmit, submitting, invalid, processingSet,
</s> add allowedClients, handleSubmit, submitting, invalid, processingSet, </s> remove {fields.map(renderField)}
</s> add {
fields.map((f) => {
const props = { ...f };
if (allowedClients && f.id === 'disallowed_clients') {
props.disabled = true;
}
return renderField(props);
})
} | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | client/src/components/Settings/Dns/Access/Form.js |
const selector = formValueSelector(FORM_NAME.ACCESS);
Form = connect((state) => {
const allowedClients = selector(state, 'allowed_clients');
return {
allowedClients,
};
})(Form);
export default flow([
withTranslation(),
reduxForm({
form: FORM_NAME.ACCESS,
}),
])(Form); | <mask> t: PropTypes.func.isRequired,
<mask> textarea: PropTypes.bool,
<mask> };
<mask>
<mask> export default flow([withTranslation(), reduxForm({ form: FORM_NAME.ACCESS })])(Form);
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove isNotInAllowedList,
</s> add lastRuleInAllowlist, </s> remove const allowed_clients = accessList.allowed_clients ?? [];
</s> add </s> remove disallowed_clients: updatedDisallowedClients,
</s> add disallowed_clients, </s> remove {fields.map(renderField)}
</s> add {
fields.map((f) => {
const props = { ...f };
if (allowedClients && f.id === 'disallowed_clients') {
props.disabled = true;
}
return renderField(props);
})
} | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | client/src/components/Settings/Dns/Access/Form.js |
"github.com/AdguardTeam/golibs/errors" | <mask> "net"
<mask> "net/http"
<mask> "strings"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/golibs/netutil"
<mask> "github.com/AdguardTeam/golibs/stringutil"
<mask> "github.com/AdguardTeam/urlfilter"
<mask> "github.com/AdguardTeam/urlfilter/filterlist"
<mask> )
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove 'description': 'Client and host access list'
</s> add 'description': >
Client and host access list. Each of the lists should contain only
unique elements. In addition, allowed and disallowed lists cannot
contain the same elements. </s> remove isNotInAllowedList,
</s> add lastRuleInAllowlist, </s> remove const Form = (props) => {
</s> add let Form = (props) => { </s> remove import { Field, reduxForm } from 'redux-form';
</s> add import { connect } from 'react-redux';
import { Field, reduxForm, formValueSelector } from 'redux-form'; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | internal/dnsforward/access.go |
err = validateAccessSet(list)
if err != nil {
httpError(r, w, http.StatusBadRequest, err.Error())
return
}
| <mask> }
<mask>
<mask> var a *accessCtx
<mask> a, err = newAccessCtx(list.AllowedClients, list.DisallowedClients, list.BlockedHosts)
<mask> if err != nil {
<mask> httpError(r, w, http.StatusBadRequest, "creating access ctx: %s", err)
<mask>
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove var name string
whois := &querylog.ClientWHOIS{}
</s> add </s> remove c, ok := clients.Find(id)
if ok {
name = c.Name
} else if ip != nil {
var rc *RuntimeClient
rc, ok = clients.FindRuntimeClient(ip)
if !ok {
continue
}
</s> add client := clients.clientInfo(ip, id, disallowed, disallowedRule)
if client.Name == "" && client.DisallowedRule == "" {
emptyClient = client </s> remove // findMultiple is a wrapper around Find to make it a valid client finder for
// the query log. err is always nil.
</s> add // findMultiple returns info about client. If no information about the client
// is found, it sends the client by default only with the "Disallowed" field
// filled in. err is always nil. </s> remove }, nil
</s> add }
}
if ip == nil {
return nil
}
var rc *RuntimeClient
rc, ok = clients.FindRuntimeClient(ip)
if ok {
return &querylog.Client{
Name: rc.Host,
DisallowedRule: rule,
WHOIS: toQueryLogWHOIS(rc.WHOISInfo),
Disallowed: disallowed,
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | internal/dnsforward/access.go |
// findMultiple returns info about client. If no information about the client
// is found, it sends the client by default only with the "Disallowed" field
// filled in. err is always nil. | <mask> Orgname: wi.Orgname,
<mask> }
<mask> }
<mask>
<mask> // findMultiple is a wrapper around Find to make it a valid client finder for
<mask> // the query log. err is always nil.
<mask> func (clients *clientsContainer) findMultiple(ids []string) (c *querylog.Client, err error) {
<mask> for _, id := range ids {
<mask> var name string
<mask> whois := &querylog.ClientWHOIS{}
<mask> ip := net.ParseIP(id)
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove var name string
whois := &querylog.ClientWHOIS{}
</s> add </s> remove c, ok := clients.Find(id)
if ok {
name = c.Name
} else if ip != nil {
var rc *RuntimeClient
rc, ok = clients.FindRuntimeClient(ip)
if !ok {
continue
}
</s> add client := clients.clientInfo(ip, id, disallowed, disallowedRule)
if client.Name == "" && client.DisallowedRule == "" {
emptyClient = client | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | internal/home/clients.go |
var emptyClient *querylog.Client
| <mask> // findMultiple returns info about client. If no information about the client
<mask> // is found, it sends the client by default only with the "Disallowed" field
<mask> // filled in. err is always nil.
<mask> func (clients *clientsContainer) findMultiple(ids []string) (c *querylog.Client, err error) {
<mask> for _, id := range ids {
<mask> ip := net.ParseIP(id)
<mask> disallowed, disallowedRule := clients.dnsServer.IsBlockedClient(ip, id)
<mask>
<mask> client := clients.clientInfo(ip, id, disallowed, disallowedRule)
<mask>
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove // findMultiple is a wrapper around Find to make it a valid client finder for
// the query log. err is always nil.
</s> add // findMultiple returns info about client. If no information about the client
// is found, it sends the client by default only with the "Disallowed" field
// filled in. err is always nil. </s> remove var name string
whois := &querylog.ClientWHOIS{}
</s> add </s> remove c, ok := clients.Find(id)
if ok {
name = c.Name
} else if ip != nil {
var rc *RuntimeClient
rc, ok = clients.FindRuntimeClient(ip)
if !ok {
continue
}
</s> add client := clients.clientInfo(ip, id, disallowed, disallowedRule)
if client.Name == "" && client.DisallowedRule == "" {
emptyClient = client | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | internal/home/clients.go |
<mask> // findMultiple is a wrapper around Find to make it a valid client finder for
<mask> // the query log. err is always nil.
<mask> func (clients *clientsContainer) findMultiple(ids []string) (c *querylog.Client, err error) {
<mask> for _, id := range ids {
<mask> var name string
<mask> whois := &querylog.ClientWHOIS{}
<mask> ip := net.ParseIP(id)
<mask>
<mask> c, ok := clients.Find(id)
<mask> if ok {
<mask> name = c.Name
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove // findMultiple is a wrapper around Find to make it a valid client finder for
// the query log. err is always nil.
</s> add // findMultiple returns info about client. If no information about the client
// is found, it sends the client by default only with the "Disallowed" field
// filled in. err is always nil. </s> remove c, ok := clients.Find(id)
if ok {
name = c.Name
} else if ip != nil {
var rc *RuntimeClient
rc, ok = clients.FindRuntimeClient(ip)
if !ok {
continue
}
</s> add client := clients.clientInfo(ip, id, disallowed, disallowedRule)
if client.Name == "" && client.DisallowedRule == "" {
emptyClient = client | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | internal/home/clients.go | |
disallowed, disallowedRule := clients.dnsServer.IsBlockedClient(ip, id) | <mask>
<mask> for _, id := range ids {
<mask> ip := net.ParseIP(id)
<mask>
<mask> client := clients.clientInfo(ip, id, disallowed, disallowedRule)
<mask>
<mask> if client.Name == "" && client.DisallowedRule == "" {
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove c, ok := clients.Find(id)
if ok {
name = c.Name
} else if ip != nil {
var rc *RuntimeClient
rc, ok = clients.FindRuntimeClient(ip)
if !ok {
continue
}
</s> add client := clients.clientInfo(ip, id, disallowed, disallowedRule)
if client.Name == "" && client.DisallowedRule == "" {
emptyClient = client </s> remove var name string
whois := &querylog.ClientWHOIS{}
</s> add </s> remove // findMultiple is a wrapper around Find to make it a valid client finder for
// the query log. err is always nil.
</s> add // findMultiple returns info about client. If no information about the client
// is found, it sends the client by default only with the "Disallowed" field
// filled in. err is always nil. | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | internal/home/clients.go |
client := clients.clientInfo(ip, id, disallowed, disallowedRule)
if client.Name == "" && client.DisallowedRule == "" {
emptyClient = client | <mask> var name string
<mask> whois := &querylog.ClientWHOIS{}
<mask> ip := net.ParseIP(id)
<mask>
<mask> c, ok := clients.Find(id)
<mask> if ok {
<mask> name = c.Name
<mask> } else if ip != nil {
<mask> var rc *RuntimeClient
<mask> rc, ok = clients.FindRuntimeClient(ip)
<mask> if !ok {
<mask> continue
<mask> }
<mask>
<mask> name = rc.Host
<mask> whois = toQueryLogWHOIS(rc.WHOISInfo)
<mask> }
<mask>
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove var name string
whois := &querylog.ClientWHOIS{}
</s> add </s> remove name = rc.Host
whois = toQueryLogWHOIS(rc.WHOISInfo)
</s> add continue </s> remove }, nil
</s> add }
}
if ip == nil {
return nil
}
var rc *RuntimeClient
rc, ok = clients.FindRuntimeClient(ip)
if ok {
return &querylog.Client{
Name: rc.Host,
DisallowedRule: rule,
WHOIS: toQueryLogWHOIS(rc.WHOISInfo),
Disallowed: disallowed,
} </s> remove disallowed, disallowedRule := clients.dnsServer.IsBlockedClient(ip, id)
</s> add return client, nil
}
return emptyClient, nil
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | internal/home/clients.go |
continue | <mask> if !ok {
<mask> continue
<mask> }
<mask>
<mask> name = rc.Host
<mask> whois = toQueryLogWHOIS(rc.WHOISInfo)
<mask> }
<mask>
<mask> disallowed, disallowedRule := clients.dnsServer.IsBlockedClient(ip, id)
<mask>
<mask> return &querylog.Client{
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove disallowed, disallowedRule := clients.dnsServer.IsBlockedClient(ip, id)
</s> add return client, nil
}
return emptyClient, nil
} </s> remove c, ok := clients.Find(id)
if ok {
name = c.Name
} else if ip != nil {
var rc *RuntimeClient
rc, ok = clients.FindRuntimeClient(ip)
if !ok {
continue
}
</s> add client := clients.clientInfo(ip, id, disallowed, disallowedRule)
if client.Name == "" && client.DisallowedRule == "" {
emptyClient = client </s> remove Name: name,
DisallowedRule: disallowedRule,
</s> add Name: client.Name,
DisallowedRule: rule, </s> remove }, nil
</s> add }
}
if ip == nil {
return nil
}
var rc *RuntimeClient
rc, ok = clients.FindRuntimeClient(ip)
if ok {
return &querylog.Client{
Name: rc.Host,
DisallowedRule: rule,
WHOIS: toQueryLogWHOIS(rc.WHOISInfo),
Disallowed: disallowed,
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | internal/home/clients.go |
return client, nil
}
return emptyClient, nil
} | <mask> name = rc.Host
<mask> whois = toQueryLogWHOIS(rc.WHOISInfo)
<mask> }
<mask>
<mask> disallowed, disallowedRule := clients.dnsServer.IsBlockedClient(ip, id)
<mask>
<mask> return &querylog.Client{
<mask> Name: name,
<mask> DisallowedRule: disallowedRule,
<mask> WHOIS: whois,
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove Name: name,
DisallowedRule: disallowedRule,
</s> add Name: client.Name,
DisallowedRule: rule, </s> remove name = rc.Host
whois = toQueryLogWHOIS(rc.WHOISInfo)
</s> add continue </s> remove }, nil
</s> add }
}
if ip == nil {
return nil
}
var rc *RuntimeClient
rc, ok = clients.FindRuntimeClient(ip)
if ok {
return &querylog.Client{
Name: rc.Host,
DisallowedRule: rule,
WHOIS: toQueryLogWHOIS(rc.WHOISInfo),
Disallowed: disallowed,
} </s> remove c, ok := clients.Find(id)
if ok {
name = c.Name
} else if ip != nil {
var rc *RuntimeClient
rc, ok = clients.FindRuntimeClient(ip)
if !ok {
continue
}
</s> add client := clients.clientInfo(ip, id, disallowed, disallowedRule)
if client.Name == "" && client.DisallowedRule == "" {
emptyClient = client | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | internal/home/clients.go |
// clientInfo is a wrapper around Find to make it a valid client finder for
// the query log.
func (clients *clientsContainer) clientInfo(
ip net.IP,
id string,
disallowed bool,
rule string,
) (c *querylog.Client) {
whois := &querylog.ClientWHOIS{}
client, ok := clients.Find(id)
if ok { | <mask>
<mask> return emptyClient, nil
<mask> }
<mask>
<mask> return &querylog.Client{
<mask> Name: client.Name,
<mask> DisallowedRule: rule,
<mask> WHOIS: whois,
<mask> Disallowed: disallowed,
<mask> }
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove Name: name,
DisallowedRule: disallowedRule,
</s> add Name: client.Name,
DisallowedRule: rule, </s> remove }, nil
</s> add }
}
if ip == nil {
return nil
}
var rc *RuntimeClient
rc, ok = clients.FindRuntimeClient(ip)
if ok {
return &querylog.Client{
Name: rc.Host,
DisallowedRule: rule,
WHOIS: toQueryLogWHOIS(rc.WHOISInfo),
Disallowed: disallowed,
} </s> remove disallowed, disallowedRule := clients.dnsServer.IsBlockedClient(ip, id)
</s> add return client, nil
}
return emptyClient, nil
} </s> remove return nil, nil
</s> add return &querylog.Client{
Name: "",
DisallowedRule: rule,
WHOIS: &querylog.ClientWHOIS{},
Disallowed: disallowed,
} </s> remove name = rc.Host
whois = toQueryLogWHOIS(rc.WHOISInfo)
</s> add continue | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | internal/home/clients.go |
Name: client.Name,
DisallowedRule: rule, | <mask>
<mask> disallowed, disallowedRule := clients.dnsServer.IsBlockedClient(ip, id)
<mask>
<mask> return &querylog.Client{
<mask> Name: name,
<mask> DisallowedRule: disallowedRule,
<mask> WHOIS: whois,
<mask> Disallowed: disallowed,
<mask> }, nil
<mask> }
<mask>
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove disallowed, disallowedRule := clients.dnsServer.IsBlockedClient(ip, id)
</s> add return client, nil
}
return emptyClient, nil
} </s> remove }, nil
</s> add }
}
if ip == nil {
return nil
}
var rc *RuntimeClient
rc, ok = clients.FindRuntimeClient(ip)
if ok {
return &querylog.Client{
Name: rc.Host,
DisallowedRule: rule,
WHOIS: toQueryLogWHOIS(rc.WHOISInfo),
Disallowed: disallowed,
} </s> remove return nil, nil
</s> add return &querylog.Client{
Name: "",
DisallowedRule: rule,
WHOIS: &querylog.ClientWHOIS{},
Disallowed: disallowed,
} </s> remove name = rc.Host
whois = toQueryLogWHOIS(rc.WHOISInfo)
</s> add continue | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | internal/home/clients.go |
}
}
if ip == nil {
return nil
}
var rc *RuntimeClient
rc, ok = clients.FindRuntimeClient(ip)
if ok {
return &querylog.Client{
Name: rc.Host,
DisallowedRule: rule,
WHOIS: toQueryLogWHOIS(rc.WHOISInfo),
Disallowed: disallowed,
} | <mask> Name: name,
<mask> DisallowedRule: disallowedRule,
<mask> WHOIS: whois,
<mask> Disallowed: disallowed,
<mask> }, nil
<mask> }
<mask>
<mask> return nil, nil
<mask> }
<mask>
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove Name: name,
DisallowedRule: disallowedRule,
</s> add Name: client.Name,
DisallowedRule: rule, </s> remove disallowed, disallowedRule := clients.dnsServer.IsBlockedClient(ip, id)
</s> add return client, nil
}
return emptyClient, nil
} </s> remove return nil, nil
</s> add return &querylog.Client{
Name: "",
DisallowedRule: rule,
WHOIS: &querylog.ClientWHOIS{},
Disallowed: disallowed,
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | internal/home/clients.go |
return &querylog.Client{
Name: "",
DisallowedRule: rule,
WHOIS: &querylog.ClientWHOIS{},
Disallowed: disallowed,
} | <mask> Disallowed: disallowed,
<mask> }, nil
<mask> }
<mask>
<mask> return nil, nil
<mask> }
<mask>
<mask> func (clients *clientsContainer) Find(id string) (c *Client, ok bool) {
<mask> clients.lock.Lock()
<mask> defer clients.lock.Unlock()
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove }, nil
</s> add }
}
if ip == nil {
return nil
}
var rc *RuntimeClient
rc, ok = clients.FindRuntimeClient(ip)
if ok {
return &querylog.Client{
Name: rc.Host,
DisallowedRule: rule,
WHOIS: toQueryLogWHOIS(rc.WHOISInfo),
Disallowed: disallowed,
} </s> remove Name: name,
DisallowedRule: disallowedRule,
</s> add Name: client.Name,
DisallowedRule: rule, </s> remove disallowed, disallowedRule := clients.dnsServer.IsBlockedClient(ip, id)
</s> add return client, nil
}
return emptyClient, nil
} </s> remove var name string
whois := &querylog.ClientWHOIS{}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | internal/home/clients.go |
Persistent client's name or runtime client's hostname. | <mask> 'description': >
<mask> The rule due to which the client is allowed or blocked.
<mask> 'name':
<mask> 'description': >
<mask> Persistent client's name or an empty string if this is a runtime
<mask> client.
<mask> 'type': 'string'
<mask> 'whois':
<mask> '$ref': '#/components/schemas/QueryLogItemClientWhois'
<mask> 'required':
<mask> - 'disallowed'
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove 'description': 'Client and host access list'
</s> add 'description': >
Client and host access list. Each of the lists should contain only
unique elements. In addition, allowed and disallowed lists cannot
contain the same elements. </s> remove "client_not_in_allowed_clients": "The client is not allowed because it is not in the \"Allowed clients\" list.",
</s> add "filter_allowlist": "WARNING: This action also will exclude the rule \"{{disallowed_rule}}\" from the list of allowed clients.",
"last_rule_in_allowlist": "Cannot disallow this client because excluding the rule \"{{disallowed_rule}}\" will DISABLE \"Allowed clients\" list.", </s> remove // findMultiple is a wrapper around Find to make it a valid client finder for
// the query log. err is always nil.
</s> add // findMultiple returns info about client. If no information about the client
// is found, it sends the client by default only with the "Disallowed" field
// filled in. err is always nil. </s> remove var name string
whois := &querylog.ClientWHOIS{}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | openapi/openapi.yaml |
'description': >
Client and host access list. Each of the lists should contain only
unique elements. In addition, allowed and disallowed lists cannot
contain the same elements. | <mask> '$ref': '#/components/schemas/AccessList'
<mask> 'AccessSetRequest':
<mask> '$ref': '#/components/schemas/AccessList'
<mask> 'AccessList':
<mask> 'description': 'Client and host access list'
<mask> 'properties':
<mask> 'allowed_clients':
<mask> 'description': >
<mask> The allowlist of clients: IP addresses, CIDRs, or client IDs.
<mask> 'items':
</s> Pull request: 3419 client allowlist collision
Updates #3419.
Squashed commit of the following:
commit 370094c00d9c15b1336fbedb1e233bd4436c9898
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:31:16 2021 +0300
added link to github issue
commit 407ba9b2db46b887a30ddb081bd37c56e56b0496
Merge: 426c8146 80548233
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 17:29:52 2021 +0300
Merge branch 'master' into 3419-client-allowlist-collision
commit 426c8146cff5c112ebb25192af276c6601200528
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 16:28:11 2021 +0300
fix en
commit d28c6022321828c6bdc55c3f9a4f655b26d146d2
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:49:12 2021 +0300
added missing space
commit b374a09327968ca5343c1595d1ab8cf317c15ffe
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Fri Sep 10 15:43:55 2021 +0300
fixes after review
commit 2be629d66e4703e2f5a85615bf1eaaa92e03c6fd
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Thu Sep 9 14:17:19 2021 +0300
fixes
commit 5c2aa6201cc0ecf404d4057e354fbb0bdadcdd6d
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 15:04:30 2021 +0300
return empty line to locale file
commit 3631c3772babbd595b1c3de4a7e91be6bac3e80f
Author: Dmitriy Seregin <d.seregin@adguard.com>
Date: Wed Sep 8 13:57:51 2021 +0300
all: fix collisions in access lists && expand block/unblock client </s> remove Persistent client's name or an empty string if this is a runtime
client.
</s> add Persistent client's name or runtime client's hostname. </s> remove "client_not_in_allowed_clients": "The client is not allowed because it is not in the \"Allowed clients\" list.",
</s> add "filter_allowlist": "WARNING: This action also will exclude the rule \"{{disallowed_rule}}\" from the list of allowed clients.",
"last_rule_in_allowlist": "Cannot disallow this client because excluding the rule \"{{disallowed_rule}}\" will DISABLE \"Allowed clients\" list.", </s> remove onClick={isNotInAllowedList ? undefined : onClick}
disabled={isNotInAllowedList || processingSet}
title={t(isNotInAllowedList ? 'client_not_in_allowed_clients' : text)}
</s> add onClick={onClick}
disabled={disabled}
title={lastRuleInAllowlist ? t('last_rule_in_allowlist', { disallowed_rule }) : ''} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/8fdd789474ca1151dfc945fd404883ebb2ffedf1 | openapi/openapi.yaml |
dynLeases := []*Lease{}
staticLeases := []*Lease{} | <mask> s.leases = nil
<mask> s.IPpool = make(map[[4]byte]net.HardwareAddr)
<mask>
<mask> data, err := ioutil.ReadFile(s.conf.DBFilePath)
<mask> if err != nil {
<mask> if !os.IsNotExist(err) {
</s> - DHCP: normalize leases on startup (prioritize static leases over dynamic) </s> remove log.Info("DHCP: loaded %d leases from DB", numLeases)
</s> add log.Info("DHCP: loaded %d (%d) leases from DB", len(s.leases), numLeases)
}
// Skip duplicate leases
// Static leases have a priority over dynamic leases
func normalizeLeases(staticLeases, dynLeases []*Lease) []*Lease {
leases := []*Lease{}
index := map[string]int{}
for i, lease := range staticLeases {
_, ok := index[lease.HWAddr.String()]
if ok {
continue // skip the lease with the same HW address
}
index[lease.HWAddr.String()] = i
leases = append(leases, lease)
}
for i, lease := range dynLeases {
_, ok := index[lease.HWAddr.String()]
if ok {
continue // skip the lease with the same HW address
}
index[lease.HWAddr.String()] = i
leases = append(leases, lease)
}
return leases </s> remove s.leases = append(s.leases, &lease)
</s> add if obj[i].Expiry == leaseExpireStatic {
staticLeases = append(staticLeases, &lease)
} else {
dynLeases = append(dynLeases, &lease)
}
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/906f26d7d276c181960048a2c059d5b141e71f0a | dhcpd/db.go |
if obj[i].Expiry == leaseExpireStatic {
staticLeases = append(staticLeases, &lease)
} else {
dynLeases = append(dynLeases, &lease)
}
} | <mask> Hostname: obj[i].Hostname,
<mask> Expiry: time.Unix(obj[i].Expiry, 0),
<mask> }
<mask>
<mask> s.leases = append(s.leases, &lease)
<mask>
<mask> s.reserveIP(lease.IP, lease.HWAddr)
<mask> }
<mask> log.Info("DHCP: loaded %d leases from DB", numLeases)
<mask> }
</s> - DHCP: normalize leases on startup (prioritize static leases over dynamic) </s> remove log.Info("DHCP: loaded %d leases from DB", numLeases)
</s> add log.Info("DHCP: loaded %d (%d) leases from DB", len(s.leases), numLeases)
}
// Skip duplicate leases
// Static leases have a priority over dynamic leases
func normalizeLeases(staticLeases, dynLeases []*Lease) []*Lease {
leases := []*Lease{}
index := map[string]int{}
for i, lease := range staticLeases {
_, ok := index[lease.HWAddr.String()]
if ok {
continue // skip the lease with the same HW address
}
index[lease.HWAddr.String()] = i
leases = append(leases, lease)
}
for i, lease := range dynLeases {
_, ok := index[lease.HWAddr.String()]
if ok {
continue // skip the lease with the same HW address
}
index[lease.HWAddr.String()] = i
leases = append(leases, lease)
}
return leases | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/906f26d7d276c181960048a2c059d5b141e71f0a | dhcpd/db.go |
s.leases = normalizeLeases(staticLeases, dynLeases)
for _, lease := range s.leases { | <mask> }
<mask> }
<mask>
<mask> s.reserveIP(lease.IP, lease.HWAddr)
<mask> }
<mask>
<mask> log.Info("DHCP: loaded %d (%d) leases from DB", len(s.leases), numLeases)
<mask> }
<mask>
</s> - DHCP: normalize leases on startup (prioritize static leases over dynamic) </s> remove s.leases = append(s.leases, &lease)
</s> add if obj[i].Expiry == leaseExpireStatic {
staticLeases = append(staticLeases, &lease)
} else {
dynLeases = append(dynLeases, &lease)
}
} </s> remove log.Info("DHCP: loaded %d leases from DB", numLeases)
</s> add log.Info("DHCP: loaded %d (%d) leases from DB", len(s.leases), numLeases)
}
// Skip duplicate leases
// Static leases have a priority over dynamic leases
func normalizeLeases(staticLeases, dynLeases []*Lease) []*Lease {
leases := []*Lease{}
index := map[string]int{}
for i, lease := range staticLeases {
_, ok := index[lease.HWAddr.String()]
if ok {
continue // skip the lease with the same HW address
}
index[lease.HWAddr.String()] = i
leases = append(leases, lease)
}
for i, lease := range dynLeases {
_, ok := index[lease.HWAddr.String()]
if ok {
continue // skip the lease with the same HW address
}
index[lease.HWAddr.String()] = i
leases = append(leases, lease)
}
return leases | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/906f26d7d276c181960048a2c059d5b141e71f0a | dhcpd/db.go |
log.Info("DHCP: loaded %d (%d) leases from DB", len(s.leases), numLeases)
}
// Skip duplicate leases
// Static leases have a priority over dynamic leases
func normalizeLeases(staticLeases, dynLeases []*Lease) []*Lease {
leases := []*Lease{}
index := map[string]int{}
for i, lease := range staticLeases {
_, ok := index[lease.HWAddr.String()]
if ok {
continue // skip the lease with the same HW address
}
index[lease.HWAddr.String()] = i
leases = append(leases, lease)
}
for i, lease := range dynLeases {
_, ok := index[lease.HWAddr.String()]
if ok {
continue // skip the lease with the same HW address
}
index[lease.HWAddr.String()] = i
leases = append(leases, lease)
}
return leases | <mask> s.leases = append(s.leases, &lease)
<mask>
<mask> s.reserveIP(lease.IP, lease.HWAddr)
<mask> }
<mask> log.Info("DHCP: loaded %d leases from DB", numLeases)
<mask> }
<mask>
<mask> // Store lease table in DB
<mask> func (s *Server) dbStore() {
<mask> var leases []leaseJSON
</s> - DHCP: normalize leases on startup (prioritize static leases over dynamic) </s> remove s.leases = append(s.leases, &lease)
</s> add if obj[i].Expiry == leaseExpireStatic {
staticLeases = append(staticLeases, &lease)
} else {
dynLeases = append(dynLeases, &lease)
}
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/906f26d7d276c181960048a2c059d5b141e71f0a | dhcpd/db.go |
"github.com/stretchr/testify/assert" | <mask> "time"
<mask>
<mask> "github.com/krolaw/dhcp4"
<mask> )
<mask>
<mask> func check(t *testing.T, result bool, msg string) {
<mask> if !result {
<mask> t.Fatal(msg)
<mask> }
</s> - DHCP: normalize leases on startup (prioritize static leases over dynamic) </s> remove log.Info("DHCP: loaded %d leases from DB", numLeases)
</s> add log.Info("DHCP: loaded %d (%d) leases from DB", len(s.leases), numLeases)
}
// Skip duplicate leases
// Static leases have a priority over dynamic leases
func normalizeLeases(staticLeases, dynLeases []*Lease) []*Lease {
leases := []*Lease{}
index := map[string]int{}
for i, lease := range staticLeases {
_, ok := index[lease.HWAddr.String()]
if ok {
continue // skip the lease with the same HW address
}
index[lease.HWAddr.String()] = i
leases = append(leases, lease)
}
for i, lease := range dynLeases {
_, ok := index[lease.HWAddr.String()]
if ok {
continue // skip the lease with the same HW address
}
index[lease.HWAddr.String()] = i
leases = append(leases, lease)
}
return leases </s> remove s.leases = append(s.leases, &lease)
</s> add if obj[i].Expiry == leaseExpireStatic {
staticLeases = append(staticLeases, &lease)
} else {
dynLeases = append(dynLeases, &lease)
}
} | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/906f26d7d276c181960048a2c059d5b141e71f0a | dhcpd/dhcpd_test.go |
export const refreshFilters = config => async (dispatch) => { | <mask> export const refreshFiltersRequest = createAction('FILTERING_REFRESH_REQUEST');
<mask> export const refreshFiltersFailure = createAction('FILTERING_REFRESH_FAILURE');
<mask> export const refreshFiltersSuccess = createAction('FILTERING_REFRESH_SUCCESS');
<mask>
<mask> export const refreshFilters = () => async (dispatch) => {
<mask> dispatch(refreshFiltersRequest());
<mask> dispatch(showLoading());
<mask> try {
<mask> const data = await apiClient.refreshFilters();
<mask> const { updated } = data;
</s> + client: handle allowlist refresh </s> remove const data = await apiClient.refreshFilters();
</s> add const data = await apiClient.refreshFilters(config); </s> remove return this.makeRequest(path, method);
</s> add const parameters = {
data: config,
headers: { 'Content-Type': 'application/json' },
};
return this.makeRequest(path, method, parameters); </s> remove refreshFilters() {
</s> add refreshFilters(config) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90b25300df15c588b4bea1eac02e92017c71d315 | client/src/actions/filtering.js |
const data = await apiClient.refreshFilters(config); | <mask> export const refreshFilters = () => async (dispatch) => {
<mask> dispatch(refreshFiltersRequest());
<mask> dispatch(showLoading());
<mask> try {
<mask> const data = await apiClient.refreshFilters();
<mask> const { updated } = data;
<mask> dispatch(refreshFiltersSuccess());
<mask>
<mask> if (updated > 0) {
<mask> dispatch(addSuccessToast(t('list_updated', { count: updated })));
</s> + client: handle allowlist refresh </s> remove export const refreshFilters = () => async (dispatch) => {
</s> add export const refreshFilters = config => async (dispatch) => { </s> remove return this.makeRequest(path, method);
</s> add const parameters = {
data: config,
headers: { 'Content-Type': 'application/json' },
};
return this.makeRequest(path, method, parameters); </s> remove refreshFilters() {
</s> add refreshFilters(config) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90b25300df15c588b4bea1eac02e92017c71d315 | client/src/actions/filtering.js |
refreshFilters(config) { | <mask> const { path, method } = this.FILTERING_STATUS;
<mask> return this.makeRequest(path, method);
<mask> }
<mask>
<mask> refreshFilters() {
<mask> const { path, method } = this.FILTERING_REFRESH;
<mask> return this.makeRequest(path, method);
<mask> }
<mask>
<mask> addFilter(config) {
</s> + client: handle allowlist refresh </s> remove return this.makeRequest(path, method);
</s> add const parameters = {
data: config,
headers: { 'Content-Type': 'application/json' },
};
return this.makeRequest(path, method, parameters); </s> remove const data = await apiClient.refreshFilters();
</s> add const data = await apiClient.refreshFilters(config); </s> remove export const refreshFilters = () => async (dispatch) => {
</s> add export const refreshFilters = config => async (dispatch) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90b25300df15c588b4bea1eac02e92017c71d315 | client/src/api/Api.js |
const parameters = {
data: config,
headers: { 'Content-Type': 'application/json' },
};
return this.makeRequest(path, method, parameters); | <mask> }
<mask>
<mask> refreshFilters() {
<mask> const { path, method } = this.FILTERING_REFRESH;
<mask> return this.makeRequest(path, method);
<mask> }
<mask>
<mask> addFilter(config) {
<mask> const { path, method } = this.FILTERING_ADD_FILTER;
<mask> const parameters = {
</s> + client: handle allowlist refresh </s> remove refreshFilters() {
</s> add refreshFilters(config) { </s> remove const data = await apiClient.refreshFilters();
</s> add const data = await apiClient.refreshFilters(config); </s> remove export const refreshFilters = () => async (dispatch) => {
</s> add export const refreshFilters = config => async (dispatch) => { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90b25300df15c588b4bea1eac02e92017c71d315 | client/src/api/Api.js |
handleRefresh = () => {
this.props.refreshFilters({ whitelist: true });
};
| <mask> };
<mask>
<mask> render() {
<mask> const {
<mask> t,
<mask> toggleFilteringModal,
<mask> addFilter,
</s> + client: handle allowlist refresh </s> remove refreshFilters,
</s> add </s> remove refreshFilters,
</s> add </s> remove return this.makeRequest(path, method);
</s> add const parameters = {
data: config,
headers: { 'Content-Type': 'application/json' },
};
return this.makeRequest(path, method, parameters); </s> remove refreshFilters() {
</s> add refreshFilters(config) { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90b25300df15c588b4bea1eac02e92017c71d315 | client/src/components/Filters/DnsAllowlist.js |
<mask> render() {
<mask> const {
<mask> t,
<mask> toggleFilteringModal,
<mask> refreshFilters,
<mask> addFilter,
<mask> toggleFilterStatus,
<mask> filtering: {
<mask> whitelistFilters,
<mask> isModalOpen,
</s> + client: handle allowlist refresh </s> remove refreshFilters,
</s> add </s> remove return this.makeRequest(path, method);
</s> add const parameters = {
data: config,
headers: { 'Content-Type': 'application/json' },
};
return this.makeRequest(path, method, parameters); </s> remove refreshFilters() {
</s> add refreshFilters(config) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90b25300df15c588b4bea1eac02e92017c71d315 | client/src/components/Filters/DnsAllowlist.js | |
handleRefresh={this.handleRefresh} | <mask> whitelist={whitelist}
<mask> />
<mask> <Actions
<mask> handleAdd={() => toggleFilteringModal({ type: MODAL_TYPE.ADD })}
<mask> handleRefresh={refreshFilters}
<mask> processingRefreshFilters={processingRefreshFilters}
<mask> whitelist={whitelist}
<mask> />
<mask> </Card>
<mask> </div>
</s> + client: handle allowlist refresh </s> remove handleRefresh={refreshFilters}
</s> add handleRefresh={this.handleRefresh} </s> remove export const refreshFilters = () => async (dispatch) => {
</s> add export const refreshFilters = config => async (dispatch) => { </s> remove const data = await apiClient.refreshFilters();
</s> add const data = await apiClient.refreshFilters(config); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90b25300df15c588b4bea1eac02e92017c71d315 | client/src/components/Filters/DnsAllowlist.js |
handleRefresh = () => {
this.props.refreshFilters({ whitelist: false });
};
| <mask> toggleFilter = (url, data) => {
<mask> this.props.toggleFilterStatus(url, data);
<mask> };
<mask>
<mask> render() {
<mask> const {
<mask> t,
<mask> toggleFilteringModal,
<mask> addFilter,
</s> + client: handle allowlist refresh </s> remove refreshFilters,
</s> add </s> remove refreshFilters,
</s> add </s> remove return this.makeRequest(path, method);
</s> add const parameters = {
data: config,
headers: { 'Content-Type': 'application/json' },
};
return this.makeRequest(path, method, parameters); </s> remove export const refreshFilters = () => async (dispatch) => {
</s> add export const refreshFilters = config => async (dispatch) => { | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90b25300df15c588b4bea1eac02e92017c71d315 | client/src/components/Filters/DnsBlocklist.js |
<mask> render() {
<mask> const {
<mask> t,
<mask> toggleFilteringModal,
<mask> refreshFilters,
<mask> addFilter,
<mask> filtering: {
<mask> filters,
<mask> isModalOpen,
<mask> isFilterAdded,
</s> + client: handle allowlist refresh </s> remove refreshFilters,
</s> add </s> remove return this.makeRequest(path, method);
</s> add const parameters = {
data: config,
headers: { 'Content-Type': 'application/json' },
};
return this.makeRequest(path, method, parameters); </s> remove refreshFilters() {
</s> add refreshFilters(config) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90b25300df15c588b4bea1eac02e92017c71d315 | client/src/components/Filters/DnsBlocklist.js | |
handleRefresh={this.handleRefresh} | <mask> toggleFilter={this.toggleFilter}
<mask> />
<mask> <Actions
<mask> handleAdd={() => toggleFilteringModal({ type: MODAL_TYPE.ADD })}
<mask> handleRefresh={refreshFilters}
<mask> processingRefreshFilters={processingRefreshFilters}
<mask> />
<mask> </Card>
<mask> </div>
<mask> </div>
</s> + client: handle allowlist refresh </s> remove handleRefresh={refreshFilters}
</s> add handleRefresh={this.handleRefresh} </s> remove export const refreshFilters = () => async (dispatch) => {
</s> add export const refreshFilters = config => async (dispatch) => { </s> remove const data = await apiClient.refreshFilters();
</s> add const data = await apiClient.refreshFilters(config); | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90b25300df15c588b4bea1eac02e92017c71d315 | client/src/components/Filters/DnsBlocklist.js |
// ignores broadcast packets when reading. | <mask> // so that all incoming packets are ignored and the discovering process
<mask> // is spoiled.
<mask> //
<mask> // It's also known that listening on the specified interface's address
<mask> // ignores broadcasted packets when reading.
<mask> var c net.PacketConn
<mask> if c, err = listenPacketReusable(iface.Name, "udp4", ":68"); err != nil {
<mask> return false, fmt.Errorf("couldn't listen on :68: %w", err)
<mask> }
<mask> defer func() { err = errors.WithDeferred(err, c.Close()) }()
</s> Pull request: home: mv local domain name to dhcp setts
Closes #3367.
Squashed commit of the following:
commit e2cabcac2d91af24b9e5f4ac8f78daf5e8d339b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:35:31 2022 +0300
home: imp test, skip dhcp test on windows
commit e58053f11e081630ad4e8d1e77a7a74226029db0
Merge: ff2fe87d 0b72bcc5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:10:25 2022 +0300
Merge branch 'master' into 3367-dhcp-local-domain-name
commit ff2fe87d8cab12e60d045be636e366e392d6d96f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 30 20:55:34 2021 +0300
home: mv local domain name to dhcp setts </s> remove // TODO(e.burkov): leases.db isn't created on Windows so removing it
// causes an error. Split the test to make it run properly on different
// operating systems.
t.Cleanup(func() { _ = os.Remove("leases.db") })
</s> add testutil.CleanupAndRequireSuccess(t, func() (err error) {
return os.Remove("leases.db")
}) </s> remove s.conf.Enabled = conf.Enabled
s.conf.InterfaceName = conf.InterfaceName
s.conf.HTTPRegister = conf.HTTPRegister
s.conf.ConfigModified = conf.ConfigModified
s.conf.DBFilePath = filepath.Join(conf.WorkDir, dbFilename)
</s> add HTTPRegister: conf.HTTPRegister,
Enabled: conf.Enabled,
InterfaceName: conf.InterfaceName,
LocalDomainName: conf.LocalDomainName,
DBFilePath: filepath.Join(conf.WorkDir, dbFilename),
},
} </s> remove // Set the broadcast bit in the DHCPNAK, so that the
// relay agent broadcasted it to the client, because the
// client may not have a correct network address or
// subnet mask, and the client may not be answering ARP
// requests.
</s> add // Set the broadcast bit in the DHCPNAK, so that the relay agent
// broadcasts it to the client, because the client may not have
// a correct network address or subnet mask, and the client may not
// be answering ARP requests. </s> remove c := dhcpd.ServerConfig{}
Context.dhcpServer.WriteDiskConfig(&c)
</s> add c := &dhcpd.ServerConfig{}
Context.dhcpServer.WriteDiskConfig(c) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90c17c79de14b51d1979c67650177b784216487c | internal/aghnet/dhcp_unix.go |
// ServerConfig is the configuration for the DHCP server. The order of YAML
// fields is important, since the YAML configuration file follows it. | <mask>
<mask> return nil
<mask> }
<mask>
<mask> // ServerConfig - DHCP server configuration
<mask> // field ordering is important -- yaml fields will mirror ordering from here
<mask> type ServerConfig struct {
<mask> Enabled bool `yaml:"enabled"`
<mask> InterfaceName string `yaml:"interface_name"`
<mask>
<mask> Conf4 V4ServerConf `yaml:"dhcpv4"`
</s> Pull request: home: mv local domain name to dhcp setts
Closes #3367.
Squashed commit of the following:
commit e2cabcac2d91af24b9e5f4ac8f78daf5e8d339b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:35:31 2022 +0300
home: imp test, skip dhcp test on windows
commit e58053f11e081630ad4e8d1e77a7a74226029db0
Merge: ff2fe87d 0b72bcc5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:10:25 2022 +0300
Merge branch 'master' into 3367-dhcp-local-domain-name
commit ff2fe87d8cab12e60d045be636e366e392d6d96f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 30 20:55:34 2021 +0300
home: mv local domain name to dhcp setts </s> remove DBFilePath string `yaml:"-"` // path to DB file
// Called when the configuration is changed by HTTP request
ConfigModified func() `yaml:"-"`
// Register an HTTP handler
HTTPRegister func(string, string, func(http.ResponseWriter, *http.Request)) `yaml:"-"`
</s> add DBFilePath string `yaml:"-"` </s> remove conf ServerConfig
</s> add // TODO(a.garipov): Either create a separate type for the internal config or
// just put the config values into Server.
conf *ServerConfig </s> remove // TODO(a.garipov): Remove this after we're finished
// with the client hostname validations in the DHCP
// server code.
</s> add // TODO(a.garipov): Remove this after we're finished with the client
// hostname validations in the DHCP server code. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90c17c79de14b51d1979c67650177b784216487c | internal/dhcpd/dhcpd.go |
// Called when the configuration is changed by HTTP request
ConfigModified func() `yaml:"-"`
// Register an HTTP handler
HTTPRegister func(string, string, func(http.ResponseWriter, *http.Request)) `yaml:"-"`
| <mask> // fields is important, since the YAML configuration file follows it.
<mask> type ServerConfig struct {
<mask> Enabled bool `yaml:"enabled"`
<mask> InterfaceName string `yaml:"interface_name"`
<mask>
<mask> // LocalDomainName is the domain name used for DHCP hosts. For example,
<mask> // a DHCP client with the hostname "myhost" can be addressed as "myhost.lan"
<mask> // when LocalDomainName is "lan".
</s> Pull request: home: mv local domain name to dhcp setts
Closes #3367.
Squashed commit of the following:
commit e2cabcac2d91af24b9e5f4ac8f78daf5e8d339b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:35:31 2022 +0300
home: imp test, skip dhcp test on windows
commit e58053f11e081630ad4e8d1e77a7a74226029db0
Merge: ff2fe87d 0b72bcc5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:10:25 2022 +0300
Merge branch 'master' into 3367-dhcp-local-domain-name
commit ff2fe87d8cab12e60d045be636e366e392d6d96f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 30 20:55:34 2021 +0300
home: mv local domain name to dhcp setts </s> remove // ServerConfig - DHCP server configuration
// field ordering is important -- yaml fields will mirror ordering from here
</s> add // ServerConfig is the configuration for the DHCP server. The order of YAML
// fields is important, since the YAML configuration file follows it. </s> remove // LocalDomainName is the domain name used for known internal hosts.
// For example, a machine called "myhost" can be addressed as
// "myhost.lan" when LocalDomainName is "lan".
LocalDomainName string `yaml:"local_domain_name"`
</s> add </s> remove conf ServerConfig
</s> add // TODO(a.garipov): Either create a separate type for the internal config or
// just put the config values into Server.
conf *ServerConfig </s> remove DBFilePath string `yaml:"-"` // path to DB file
// Called when the configuration is changed by HTTP request
ConfigModified func() `yaml:"-"`
// Register an HTTP handler
HTTPRegister func(string, string, func(http.ResponseWriter, *http.Request)) `yaml:"-"`
</s> add DBFilePath string `yaml:"-"` | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90c17c79de14b51d1979c67650177b784216487c | internal/dhcpd/dhcpd.go |
// LocalDomainName is the domain name used for DHCP hosts. For example,
// a DHCP client with the hostname "myhost" can be addressed as "myhost.lan"
// when LocalDomainName is "lan".
LocalDomainName string `yaml:"local_domain_name"`
| <mask>
<mask> Enabled bool `yaml:"enabled"`
<mask> InterfaceName string `yaml:"interface_name"`
<mask>
<mask> Conf4 V4ServerConf `yaml:"dhcpv4"`
<mask> Conf6 V6ServerConf `yaml:"dhcpv6"`
<mask>
<mask> WorkDir string `yaml:"-"`
</s> Pull request: home: mv local domain name to dhcp setts
Closes #3367.
Squashed commit of the following:
commit e2cabcac2d91af24b9e5f4ac8f78daf5e8d339b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:35:31 2022 +0300
home: imp test, skip dhcp test on windows
commit e58053f11e081630ad4e8d1e77a7a74226029db0
Merge: ff2fe87d 0b72bcc5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:10:25 2022 +0300
Merge branch 'master' into 3367-dhcp-local-domain-name
commit ff2fe87d8cab12e60d045be636e366e392d6d96f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 30 20:55:34 2021 +0300
home: mv local domain name to dhcp setts </s> remove DBFilePath string `yaml:"-"` // path to DB file
// Called when the configuration is changed by HTTP request
ConfigModified func() `yaml:"-"`
// Register an HTTP handler
HTTPRegister func(string, string, func(http.ResponseWriter, *http.Request)) `yaml:"-"`
</s> add DBFilePath string `yaml:"-"` </s> remove // ServerConfig - DHCP server configuration
// field ordering is important -- yaml fields will mirror ordering from here
</s> add // ServerConfig is the configuration for the DHCP server. The order of YAML
// fields is important, since the YAML configuration file follows it. </s> remove data []byte
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90c17c79de14b51d1979c67650177b784216487c | internal/dhcpd/dhcpd.go |
DBFilePath string `yaml:"-"` | <mask> Conf4 V4ServerConf `yaml:"dhcpv4"`
<mask> Conf6 V6ServerConf `yaml:"dhcpv6"`
<mask>
<mask> WorkDir string `yaml:"-"`
<mask> DBFilePath string `yaml:"-"` // path to DB file
<mask>
<mask> // Called when the configuration is changed by HTTP request
<mask> ConfigModified func() `yaml:"-"`
<mask>
<mask> // Register an HTTP handler
<mask> HTTPRegister func(string, string, func(http.ResponseWriter, *http.Request)) `yaml:"-"`
<mask> }
<mask>
<mask> // OnLeaseChangedT is a callback for lease changes.
<mask> type OnLeaseChangedT func(flags int)
<mask>
</s> Pull request: home: mv local domain name to dhcp setts
Closes #3367.
Squashed commit of the following:
commit e2cabcac2d91af24b9e5f4ac8f78daf5e8d339b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:35:31 2022 +0300
home: imp test, skip dhcp test on windows
commit e58053f11e081630ad4e8d1e77a7a74226029db0
Merge: ff2fe87d 0b72bcc5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:10:25 2022 +0300
Merge branch 'master' into 3367-dhcp-local-domain-name
commit ff2fe87d8cab12e60d045be636e366e392d6d96f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 30 20:55:34 2021 +0300
home: mv local domain name to dhcp setts </s> remove // ServerConfig - DHCP server configuration
// field ordering is important -- yaml fields will mirror ordering from here
</s> add // ServerConfig is the configuration for the DHCP server. The order of YAML
// fields is important, since the YAML configuration file follows it. </s> remove conf ServerConfig
</s> add // TODO(a.garipov): Either create a separate type for the internal config or
// just put the config values into Server.
conf *ServerConfig </s> remove // LocalDomainName is the domain name used for known internal hosts.
// For example, a machine called "myhost" can be addressed as
// "myhost.lan" when LocalDomainName is "lan".
LocalDomainName string `yaml:"local_domain_name"`
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90c17c79de14b51d1979c67650177b784216487c | internal/dhcpd/dhcpd.go |
// TODO(a.garipov): Either create a separate type for the internal config or
// just put the config values into Server.
conf *ServerConfig | <mask> type Server struct {
<mask> srv4 DHCPServer
<mask> srv6 DHCPServer
<mask>
<mask> conf ServerConfig
<mask>
<mask> // Called when the leases DB is modified
<mask> onLeaseChanged []OnLeaseChangedT
<mask> }
<mask>
</s> Pull request: home: mv local domain name to dhcp setts
Closes #3367.
Squashed commit of the following:
commit e2cabcac2d91af24b9e5f4ac8f78daf5e8d339b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:35:31 2022 +0300
home: imp test, skip dhcp test on windows
commit e58053f11e081630ad4e8d1e77a7a74226029db0
Merge: ff2fe87d 0b72bcc5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:10:25 2022 +0300
Merge branch 'master' into 3367-dhcp-local-domain-name
commit ff2fe87d8cab12e60d045be636e366e392d6d96f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 30 20:55:34 2021 +0300
home: mv local domain name to dhcp setts </s> remove // ServerConfig - DHCP server configuration
// field ordering is important -- yaml fields will mirror ordering from here
</s> add // ServerConfig is the configuration for the DHCP server. The order of YAML
// fields is important, since the YAML configuration file follows it. </s> remove DBFilePath string `yaml:"-"` // path to DB file
// Called when the configuration is changed by HTTP request
ConfigModified func() `yaml:"-"`
// Register an HTTP handler
HTTPRegister func(string, string, func(http.ResponseWriter, *http.Request)) `yaml:"-"`
</s> add DBFilePath string `yaml:"-"` </s> remove // ignores broadcasted packets when reading.
</s> add // ignores broadcast packets when reading. </s> remove const currentSchemaVersion = 12
</s> add const currentSchemaVersion = 13 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90c17c79de14b51d1979c67650177b784216487c | internal/dhcpd/dhcpd.go |
func Create(conf *ServerConfig) (s *Server, err error) {
s = &Server{
conf: &ServerConfig{
ConfigModified: conf.ConfigModified, | <mask> SetOnLeaseChanged(onLeaseChanged OnLeaseChangedT)
<mask> }
<mask>
<mask> // Create - create object
<mask> func Create(conf ServerConfig) (s *Server, err error) {
<mask> s = &Server{}
<mask>
<mask> s.conf.Enabled = conf.Enabled
<mask> s.conf.InterfaceName = conf.InterfaceName
<mask> s.conf.HTTPRegister = conf.HTTPRegister
<mask> s.conf.ConfigModified = conf.ConfigModified
</s> Pull request: home: mv local domain name to dhcp setts
Closes #3367.
Squashed commit of the following:
commit e2cabcac2d91af24b9e5f4ac8f78daf5e8d339b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:35:31 2022 +0300
home: imp test, skip dhcp test on windows
commit e58053f11e081630ad4e8d1e77a7a74226029db0
Merge: ff2fe87d 0b72bcc5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:10:25 2022 +0300
Merge branch 'master' into 3367-dhcp-local-domain-name
commit ff2fe87d8cab12e60d045be636e366e392d6d96f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 30 20:55:34 2021 +0300
home: mv local domain name to dhcp setts </s> remove s.conf.Enabled = conf.Enabled
s.conf.InterfaceName = conf.InterfaceName
s.conf.HTTPRegister = conf.HTTPRegister
s.conf.ConfigModified = conf.ConfigModified
s.conf.DBFilePath = filepath.Join(conf.WorkDir, dbFilename)
</s> add HTTPRegister: conf.HTTPRegister,
Enabled: conf.Enabled,
InterfaceName: conf.InterfaceName,
LocalDomainName: conf.LocalDomainName,
DBFilePath: filepath.Join(conf.WorkDir, dbFilename),
},
} </s> remove conf: ServerConfig{
</s> add conf: &ServerConfig{ </s> remove // TODO(e.burkov): leases.db isn't created on Windows so removing it
// causes an error. Split the test to make it run properly on different
// operating systems.
t.Cleanup(func() { _ = os.Remove("leases.db") })
</s> add testutil.CleanupAndRequireSuccess(t, func() (err error) {
return os.Remove("leases.db")
}) </s> remove c := dhcpd.ServerConfig{}
Context.dhcpServer.WriteDiskConfig(&c)
</s> add c := &dhcpd.ServerConfig{}
Context.dhcpServer.WriteDiskConfig(c) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90c17c79de14b51d1979c67650177b784216487c | internal/dhcpd/dhcpd.go |
HTTPRegister: conf.HTTPRegister,
Enabled: conf.Enabled,
InterfaceName: conf.InterfaceName,
LocalDomainName: conf.LocalDomainName,
DBFilePath: filepath.Join(conf.WorkDir, dbFilename),
},
} | <mask> // Create - create object
<mask> func Create(conf ServerConfig) (s *Server, err error) {
<mask> s = &Server{}
<mask>
<mask> s.conf.Enabled = conf.Enabled
<mask> s.conf.InterfaceName = conf.InterfaceName
<mask> s.conf.HTTPRegister = conf.HTTPRegister
<mask> s.conf.ConfigModified = conf.ConfigModified
<mask> s.conf.DBFilePath = filepath.Join(conf.WorkDir, dbFilename)
<mask>
<mask> if !webHandlersRegistered && s.conf.HTTPRegister != nil {
<mask> if runtime.GOOS == "windows" {
<mask> // Our DHCP server doesn't work on Windows yet, so
<mask> // signal that to the front with an HTTP 501.
</s> Pull request: home: mv local domain name to dhcp setts
Closes #3367.
Squashed commit of the following:
commit e2cabcac2d91af24b9e5f4ac8f78daf5e8d339b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:35:31 2022 +0300
home: imp test, skip dhcp test on windows
commit e58053f11e081630ad4e8d1e77a7a74226029db0
Merge: ff2fe87d 0b72bcc5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:10:25 2022 +0300
Merge branch 'master' into 3367-dhcp-local-domain-name
commit ff2fe87d8cab12e60d045be636e366e392d6d96f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 30 20:55:34 2021 +0300
home: mv local domain name to dhcp setts </s> remove func Create(conf ServerConfig) (s *Server, err error) {
s = &Server{}
</s> add func Create(conf *ServerConfig) (s *Server, err error) {
s = &Server{
conf: &ServerConfig{
ConfigModified: conf.ConfigModified, </s> remove // TODO(e.burkov): leases.db isn't created on Windows so removing it
// causes an error. Split the test to make it run properly on different
// operating systems.
t.Cleanup(func() { _ = os.Remove("leases.db") })
</s> add testutil.CleanupAndRequireSuccess(t, func() (err error) {
return os.Remove("leases.db")
}) </s> remove // TODO(a.garipov): Remove this after we're finished
// with the client hostname validations in the DHCP
// server code.
</s> add // TODO(a.garipov): Remove this after we're finished with the client
// hostname validations in the DHCP server code. </s> remove // ignores broadcasted packets when reading.
</s> add // ignores broadcast packets when reading. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90c17c79de14b51d1979c67650177b784216487c | internal/dhcpd/dhcpd.go |
c.LocalDomainName = s.conf.LocalDomainName | <mask> c.Enabled = s.conf.Enabled
<mask> c.InterfaceName = s.conf.InterfaceName
<mask> s.srv4.WriteDiskConfig4(&c.Conf4)
<mask> s.srv6.WriteDiskConfig6(&c.Conf6)
<mask> }
<mask>
<mask> // Start will listen on port 67 and serve DHCP requests.
</s> Pull request: home: mv local domain name to dhcp setts
Closes #3367.
Squashed commit of the following:
commit e2cabcac2d91af24b9e5f4ac8f78daf5e8d339b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:35:31 2022 +0300
home: imp test, skip dhcp test on windows
commit e58053f11e081630ad4e8d1e77a7a74226029db0
Merge: ff2fe87d 0b72bcc5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:10:25 2022 +0300
Merge branch 'master' into 3367-dhcp-local-domain-name
commit ff2fe87d8cab12e60d045be636e366e392d6d96f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 30 20:55:34 2021 +0300
home: mv local domain name to dhcp setts </s> remove s.conf.Enabled = conf.Enabled
s.conf.InterfaceName = conf.InterfaceName
s.conf.HTTPRegister = conf.HTTPRegister
s.conf.ConfigModified = conf.ConfigModified
s.conf.DBFilePath = filepath.Join(conf.WorkDir, dbFilename)
</s> add HTTPRegister: conf.HTTPRegister,
Enabled: conf.Enabled,
InterfaceName: conf.InterfaceName,
LocalDomainName: conf.LocalDomainName,
DBFilePath: filepath.Join(conf.WorkDir, dbFilename),
},
} </s> remove func Create(conf ServerConfig) (s *Server, err error) {
s = &Server{}
</s> add func Create(conf *ServerConfig) (s *Server, err error) {
s = &Server{
conf: &ServerConfig{
ConfigModified: conf.ConfigModified, </s> remove // ignores broadcasted packets when reading.
</s> add // ignores broadcast packets when reading. </s> remove // TODO(e.burkov): leases.db isn't created on Windows so removing it
// causes an error. Split the test to make it run properly on different
// operating systems.
t.Cleanup(func() { _ = os.Remove("leases.db") })
</s> add testutil.CleanupAndRequireSuccess(t, func() (err error) {
return os.Remove("leases.db")
}) </s> remove // Set the broadcast bit in the DHCPNAK, so that the
// relay agent broadcasted it to the client, because the
// client may not have a correct network address or
// subnet mask, and the client may not be answering ARP
// requests.
</s> add // Set the broadcast bit in the DHCPNAK, so that the relay agent
// broadcasts it to the client, because the client may not have
// a correct network address or subnet mask, and the client may not
// be answering ARP requests. | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90c17c79de14b51d1979c67650177b784216487c | internal/dhcpd/dhcpd.go |
conf: &ServerConfig{ | <mask> // Leases database store/load.
<mask> func TestDB(t *testing.T) {
<mask> var err error
<mask> s := Server{
<mask> conf: ServerConfig{
<mask> DBFilePath: dbFilename,
<mask> },
<mask> }
<mask>
<mask> s.srv4, err = v4Create(V4ServerConf{
</s> Pull request: home: mv local domain name to dhcp setts
Closes #3367.
Squashed commit of the following:
commit e2cabcac2d91af24b9e5f4ac8f78daf5e8d339b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:35:31 2022 +0300
home: imp test, skip dhcp test on windows
commit e58053f11e081630ad4e8d1e77a7a74226029db0
Merge: ff2fe87d 0b72bcc5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:10:25 2022 +0300
Merge branch 'master' into 3367-dhcp-local-domain-name
commit ff2fe87d8cab12e60d045be636e366e392d6d96f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 30 20:55:34 2021 +0300
home: mv local domain name to dhcp setts </s> remove func Create(conf ServerConfig) (s *Server, err error) {
s = &Server{}
</s> add func Create(conf *ServerConfig) (s *Server, err error) {
s = &Server{
conf: &ServerConfig{
ConfigModified: conf.ConfigModified, </s> remove oldconf := s.conf
s.conf = ServerConfig{
WorkDir: oldconf.WorkDir,
HTTPRegister: oldconf.HTTPRegister,
ConfigModified: oldconf.ConfigModified,
DBFilePath: oldconf.DBFilePath,
</s> add s.conf = &ServerConfig{
ConfigModified: s.conf.ConfigModified,
HTTPRegister: s.conf.HTTPRegister,
LocalDomainName: s.conf.LocalDomainName,
WorkDir: s.conf.WorkDir,
DBFilePath: s.conf.DBFilePath, </s> remove s.conf.Enabled = conf.Enabled
s.conf.InterfaceName = conf.InterfaceName
s.conf.HTTPRegister = conf.HTTPRegister
s.conf.ConfigModified = conf.ConfigModified
s.conf.DBFilePath = filepath.Join(conf.WorkDir, dbFilename)
</s> add HTTPRegister: conf.HTTPRegister,
Enabled: conf.Enabled,
InterfaceName: conf.InterfaceName,
LocalDomainName: conf.LocalDomainName,
DBFilePath: filepath.Join(conf.WorkDir, dbFilename),
},
} </s> remove // ignores broadcasted packets when reading.
</s> add // ignores broadcast packets when reading. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90c17c79de14b51d1979c67650177b784216487c | internal/dhcpd/dhcpd_test.go |
wantErrMsg string | <mask> testCases := []struct {
<mask> name string
<mask> gatewayIP net.IP
<mask> subnetMask net.IP
<mask> }{{
<mask> name: "gateway_in_range",
<mask> wantErrMsg: "dhcpv4: gateway ip 192.168.10.120 in the ip range: " +
</s> Pull request: home: mv local domain name to dhcp setts
Closes #3367.
Squashed commit of the following:
commit e2cabcac2d91af24b9e5f4ac8f78daf5e8d339b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:35:31 2022 +0300
home: imp test, skip dhcp test on windows
commit e58053f11e081630ad4e8d1e77a7a74226029db0
Merge: ff2fe87d 0b72bcc5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:10:25 2022 +0300
Merge branch 'master' into 3367-dhcp-local-domain-name
commit ff2fe87d8cab12e60d045be636e366e392d6d96f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 30 20:55:34 2021 +0300
home: mv local domain name to dhcp setts </s> remove wantErrMsg string
</s> add </s> remove name: "gateway_in_range",
gatewayIP: net.IP{192, 168, 10, 120},
subnetMask: net.IP{255, 255, 255, 0},
</s> add name: "gateway_in_range", </s> remove name: "outside_range_start",
gatewayIP: net.IP{192, 168, 10, 1},
subnetMask: net.IP{255, 255, 255, 240},
</s> add name: "outside_range_start", | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90c17c79de14b51d1979c67650177b784216487c | internal/dhcpd/dhcpd_test.go |
<mask> testCases := []struct {
<mask> name string
<mask> gatewayIP net.IP
<mask> subnetMask net.IP
<mask> wantErrMsg string
<mask> }{{
<mask> name: "gateway_in_range",
<mask> gatewayIP: net.IP{192, 168, 10, 120},
<mask> subnetMask: net.IP{255, 255, 255, 0},
<mask> wantErrMsg: "dhcpv4: gateway ip 192.168.10.120 in the ip range: " +
</s> Pull request: home: mv local domain name to dhcp setts
Closes #3367.
Squashed commit of the following:
commit e2cabcac2d91af24b9e5f4ac8f78daf5e8d339b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:35:31 2022 +0300
home: imp test, skip dhcp test on windows
commit e58053f11e081630ad4e8d1e77a7a74226029db0
Merge: ff2fe87d 0b72bcc5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:10:25 2022 +0300
Merge branch 'master' into 3367-dhcp-local-domain-name
commit ff2fe87d8cab12e60d045be636e366e392d6d96f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 30 20:55:34 2021 +0300
home: mv local domain name to dhcp setts </s> remove name: "gateway_in_range",
gatewayIP: net.IP{192, 168, 10, 120},
subnetMask: net.IP{255, 255, 255, 0},
</s> add name: "gateway_in_range", </s> remove name: "outside_range_start",
gatewayIP: net.IP{192, 168, 10, 1},
subnetMask: net.IP{255, 255, 255, 240},
</s> add name: "outside_range_start", </s> remove }, {
name: "outside_range_end",
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90c17c79de14b51d1979c67650177b784216487c | internal/dhcpd/dhcpd_test.go | |
name: "gateway_in_range", | <mask> gatewayIP net.IP
<mask> subnetMask net.IP
<mask> wantErrMsg string
<mask> }{{
<mask> name: "gateway_in_range",
<mask> gatewayIP: net.IP{192, 168, 10, 120},
<mask> subnetMask: net.IP{255, 255, 255, 0},
<mask> wantErrMsg: "dhcpv4: gateway ip 192.168.10.120 in the ip range: " +
<mask> "192.168.10.20-192.168.10.200",
<mask> }, {
<mask> name: "outside_range_start",
<mask> gatewayIP: net.IP{192, 168, 10, 1},
</s> Pull request: home: mv local domain name to dhcp setts
Closes #3367.
Squashed commit of the following:
commit e2cabcac2d91af24b9e5f4ac8f78daf5e8d339b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:35:31 2022 +0300
home: imp test, skip dhcp test on windows
commit e58053f11e081630ad4e8d1e77a7a74226029db0
Merge: ff2fe87d 0b72bcc5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:10:25 2022 +0300
Merge branch 'master' into 3367-dhcp-local-domain-name
commit ff2fe87d8cab12e60d045be636e366e392d6d96f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 30 20:55:34 2021 +0300
home: mv local domain name to dhcp setts </s> remove wantErrMsg string
</s> add </s> remove name: "outside_range_start",
gatewayIP: net.IP{192, 168, 10, 1},
subnetMask: net.IP{255, 255, 255, 240},
</s> add name: "outside_range_start", </s> remove }, {
name: "outside_range_end",
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90c17c79de14b51d1979c67650177b784216487c | internal/dhcpd/dhcpd_test.go |
gatewayIP: net.IP{192, 168, 10, 120},
subnetMask: net.IP{255, 255, 255, 0}, | <mask> wantErrMsg: "dhcpv4: gateway ip 192.168.10.120 in the ip range: " +
<mask> "192.168.10.20-192.168.10.200",
<mask> }, {
<mask> name: "outside_range_start",
<mask> wantErrMsg: "dhcpv4: range start 192.168.10.20 is outside network " +
<mask> "192.168.10.1/28",
</s> Pull request: home: mv local domain name to dhcp setts
Closes #3367.
Squashed commit of the following:
commit e2cabcac2d91af24b9e5f4ac8f78daf5e8d339b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:35:31 2022 +0300
home: imp test, skip dhcp test on windows
commit e58053f11e081630ad4e8d1e77a7a74226029db0
Merge: ff2fe87d 0b72bcc5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:10:25 2022 +0300
Merge branch 'master' into 3367-dhcp-local-domain-name
commit ff2fe87d8cab12e60d045be636e366e392d6d96f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 30 20:55:34 2021 +0300
home: mv local domain name to dhcp setts </s> remove name: "outside_range_start",
gatewayIP: net.IP{192, 168, 10, 1},
subnetMask: net.IP{255, 255, 255, 240},
</s> add name: "outside_range_start", </s> remove }, {
name: "outside_range_end",
</s> add </s> remove name: "gateway_in_range",
gatewayIP: net.IP{192, 168, 10, 120},
subnetMask: net.IP{255, 255, 255, 0},
</s> add name: "gateway_in_range", </s> remove wantErrMsg string
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90c17c79de14b51d1979c67650177b784216487c | internal/dhcpd/dhcpd_test.go |
name: "outside_range_start", | <mask> subnetMask: net.IP{255, 255, 255, 0},
<mask> wantErrMsg: "dhcpv4: gateway ip 192.168.10.120 in the ip range: " +
<mask> "192.168.10.20-192.168.10.200",
<mask> }, {
<mask> name: "outside_range_start",
<mask> gatewayIP: net.IP{192, 168, 10, 1},
<mask> subnetMask: net.IP{255, 255, 255, 240},
<mask> wantErrMsg: "dhcpv4: range start 192.168.10.20 is outside network " +
<mask> "192.168.10.1/28",
<mask> }, {
<mask> name: "outside_range_end",
<mask> gatewayIP: net.IP{192, 168, 10, 1},
</s> Pull request: home: mv local domain name to dhcp setts
Closes #3367.
Squashed commit of the following:
commit e2cabcac2d91af24b9e5f4ac8f78daf5e8d339b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:35:31 2022 +0300
home: imp test, skip dhcp test on windows
commit e58053f11e081630ad4e8d1e77a7a74226029db0
Merge: ff2fe87d 0b72bcc5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:10:25 2022 +0300
Merge branch 'master' into 3367-dhcp-local-domain-name
commit ff2fe87d8cab12e60d045be636e366e392d6d96f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 30 20:55:34 2021 +0300
home: mv local domain name to dhcp setts </s> remove }, {
name: "outside_range_end",
</s> add </s> remove name: "gateway_in_range",
gatewayIP: net.IP{192, 168, 10, 120},
subnetMask: net.IP{255, 255, 255, 0},
</s> add name: "gateway_in_range", </s> remove subnetMask: net.IP{255, 255, 255, 224},
</s> add subnetMask: net.IP{255, 255, 255, 240},
}, {
name: "outside_range_end", </s> remove wantErrMsg string
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90c17c79de14b51d1979c67650177b784216487c | internal/dhcpd/dhcpd_test.go |
<mask> gatewayIP: net.IP{192, 168, 10, 1},
<mask> subnetMask: net.IP{255, 255, 255, 240},
<mask> wantErrMsg: "dhcpv4: range start 192.168.10.20 is outside network " +
<mask> "192.168.10.1/28",
<mask> }, {
<mask> name: "outside_range_end",
<mask> gatewayIP: net.IP{192, 168, 10, 1},
<mask> subnetMask: net.IP{255, 255, 255, 224},
<mask> wantErrMsg: "dhcpv4: range end 192.168.10.200 is outside network " +
<mask> "192.168.10.1/27",
<mask> }}
</s> Pull request: home: mv local domain name to dhcp setts
Closes #3367.
Squashed commit of the following:
commit e2cabcac2d91af24b9e5f4ac8f78daf5e8d339b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:35:31 2022 +0300
home: imp test, skip dhcp test on windows
commit e58053f11e081630ad4e8d1e77a7a74226029db0
Merge: ff2fe87d 0b72bcc5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:10:25 2022 +0300
Merge branch 'master' into 3367-dhcp-local-domain-name
commit ff2fe87d8cab12e60d045be636e366e392d6d96f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 30 20:55:34 2021 +0300
home: mv local domain name to dhcp setts </s> remove subnetMask: net.IP{255, 255, 255, 224},
</s> add subnetMask: net.IP{255, 255, 255, 240},
}, {
name: "outside_range_end", </s> remove name: "outside_range_start",
gatewayIP: net.IP{192, 168, 10, 1},
subnetMask: net.IP{255, 255, 255, 240},
</s> add name: "outside_range_start", </s> remove name: "gateway_in_range",
gatewayIP: net.IP{192, 168, 10, 120},
subnetMask: net.IP{255, 255, 255, 0},
</s> add name: "gateway_in_range", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90c17c79de14b51d1979c67650177b784216487c | internal/dhcpd/dhcpd_test.go | |
subnetMask: net.IP{255, 255, 255, 240},
}, {
name: "outside_range_end", | <mask> "192.168.10.1/28",
<mask> }, {
<mask> name: "outside_range_end",
<mask> gatewayIP: net.IP{192, 168, 10, 1},
<mask> subnetMask: net.IP{255, 255, 255, 224},
<mask> wantErrMsg: "dhcpv4: range end 192.168.10.200 is outside network " +
<mask> "192.168.10.1/27",
<mask> }}
<mask>
<mask> for _, tc := range testCases {
</s> Pull request: home: mv local domain name to dhcp setts
Closes #3367.
Squashed commit of the following:
commit e2cabcac2d91af24b9e5f4ac8f78daf5e8d339b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:35:31 2022 +0300
home: imp test, skip dhcp test on windows
commit e58053f11e081630ad4e8d1e77a7a74226029db0
Merge: ff2fe87d 0b72bcc5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:10:25 2022 +0300
Merge branch 'master' into 3367-dhcp-local-domain-name
commit ff2fe87d8cab12e60d045be636e366e392d6d96f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 30 20:55:34 2021 +0300
home: mv local domain name to dhcp setts </s> remove }, {
name: "outside_range_end",
</s> add </s> remove name: "outside_range_start",
gatewayIP: net.IP{192, 168, 10, 1},
subnetMask: net.IP{255, 255, 255, 240},
</s> add name: "outside_range_start", </s> remove name: "gateway_in_range",
gatewayIP: net.IP{192, 168, 10, 120},
subnetMask: net.IP{255, 255, 255, 0},
</s> add name: "gateway_in_range", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90c17c79de14b51d1979c67650177b784216487c | internal/dhcpd/dhcpd_test.go |
gatewayIP: net.IP{192, 168, 10, 1},
subnetMask: net.IP{255, 255, 255, 224}, | <mask> wantErrMsg: "dhcpv4: range end 192.168.10.200 is outside network " +
<mask> "192.168.10.1/27",
<mask> }}
<mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
</s> Pull request: home: mv local domain name to dhcp setts
Closes #3367.
Squashed commit of the following:
commit e2cabcac2d91af24b9e5f4ac8f78daf5e8d339b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:35:31 2022 +0300
home: imp test, skip dhcp test on windows
commit e58053f11e081630ad4e8d1e77a7a74226029db0
Merge: ff2fe87d 0b72bcc5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:10:25 2022 +0300
Merge branch 'master' into 3367-dhcp-local-domain-name
commit ff2fe87d8cab12e60d045be636e366e392d6d96f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 30 20:55:34 2021 +0300
home: mv local domain name to dhcp setts </s> remove subnetMask: net.IP{255, 255, 255, 224},
</s> add subnetMask: net.IP{255, 255, 255, 240},
}, {
name: "outside_range_end", </s> remove }, {
name: "outside_range_end",
</s> add </s> remove data: []byte("flase"),
wantErrMsg: `invalid nullBool value "flase"`,
</s> add wantErrMsg: `invalid nullBool value "invalid"`,
data: []byte("invalid"), </s> remove name: "outside_range_start",
gatewayIP: net.IP{192, 168, 10, 1},
subnetMask: net.IP{255, 255, 255, 240},
</s> add name: "outside_range_start", | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90c17c79de14b51d1979c67650177b784216487c | internal/dhcpd/dhcpd_test.go |
s.conf = &ServerConfig{
ConfigModified: s.conf.ConfigModified,
HTTPRegister: s.conf.HTTPRegister,
LocalDomainName: s.conf.LocalDomainName,
WorkDir: s.conf.WorkDir,
DBFilePath: s.conf.DBFilePath, | <mask> if err != nil && !errors.Is(err, os.ErrNotExist) {
<mask> log.Error("dhcp: removing db: %s", err)
<mask> }
<mask>
<mask> oldconf := s.conf
<mask> s.conf = ServerConfig{
<mask> WorkDir: oldconf.WorkDir,
<mask> HTTPRegister: oldconf.HTTPRegister,
<mask> ConfigModified: oldconf.ConfigModified,
<mask> DBFilePath: oldconf.DBFilePath,
<mask> }
<mask>
<mask> v4conf := V4ServerConf{
<mask> LeaseDuration: DefaultDHCPLeaseTTL,
<mask> ICMPTimeout: DefaultDHCPTimeoutICMP,
</s> Pull request: home: mv local domain name to dhcp setts
Closes #3367.
Squashed commit of the following:
commit e2cabcac2d91af24b9e5f4ac8f78daf5e8d339b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:35:31 2022 +0300
home: imp test, skip dhcp test on windows
commit e58053f11e081630ad4e8d1e77a7a74226029db0
Merge: ff2fe87d 0b72bcc5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:10:25 2022 +0300
Merge branch 'master' into 3367-dhcp-local-domain-name
commit ff2fe87d8cab12e60d045be636e366e392d6d96f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 30 20:55:34 2021 +0300
home: mv local domain name to dhcp setts </s> remove s.conf.Enabled = conf.Enabled
s.conf.InterfaceName = conf.InterfaceName
s.conf.HTTPRegister = conf.HTTPRegister
s.conf.ConfigModified = conf.ConfigModified
s.conf.DBFilePath = filepath.Join(conf.WorkDir, dbFilename)
</s> add HTTPRegister: conf.HTTPRegister,
Enabled: conf.Enabled,
InterfaceName: conf.InterfaceName,
LocalDomainName: conf.LocalDomainName,
DBFilePath: filepath.Join(conf.WorkDir, dbFilename),
},
} </s> remove conf: ServerConfig{
</s> add conf: &ServerConfig{ </s> remove c := dhcpd.ServerConfig{}
Context.dhcpServer.WriteDiskConfig(&c)
</s> add c := &dhcpd.ServerConfig{}
Context.dhcpServer.WriteDiskConfig(c) </s> remove // TODO(a.garipov): Remove this after we're finished
// with the client hostname validations in the DHCP
// server code.
</s> add // TODO(a.garipov): Remove this after we're finished with the client
// hostname validations in the DHCP server code. </s> remove // ignores broadcasted packets when reading.
</s> add // ignores broadcast packets when reading. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90c17c79de14b51d1979c67650177b784216487c | internal/dhcpd/http.go |
<mask>
<mask> func TestNullBool_UnmarshalJSON(t *testing.T) {
<mask> testCases := []struct {
<mask> name string
<mask> data []byte
<mask> wantErrMsg string
<mask> want nullBool
<mask> }{{
<mask> name: "empty",
<mask> data: []byte{},
</s> Pull request: home: mv local domain name to dhcp setts
Closes #3367.
Squashed commit of the following:
commit e2cabcac2d91af24b9e5f4ac8f78daf5e8d339b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:35:31 2022 +0300
home: imp test, skip dhcp test on windows
commit e58053f11e081630ad4e8d1e77a7a74226029db0
Merge: ff2fe87d 0b72bcc5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:10:25 2022 +0300
Merge branch 'master' into 3367-dhcp-local-domain-name
commit ff2fe87d8cab12e60d045be636e366e392d6d96f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 30 20:55:34 2021 +0300
home: mv local domain name to dhcp setts </s> remove data: []byte{},
</s> add </s> remove wantErrMsg string
</s> add </s> remove data: []byte("flase"),
wantErrMsg: `invalid nullBool value "flase"`,
</s> add wantErrMsg: `invalid nullBool value "invalid"`,
data: []byte("invalid"), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90c17c79de14b51d1979c67650177b784216487c | internal/dhcpd/nullbool_test.go | |
data []byte | <mask> testCases := []struct {
<mask> name string
<mask> wantErrMsg string
<mask> want nullBool
<mask> }{{
<mask> name: "empty",
<mask> wantErrMsg: "",
</s> Pull request: home: mv local domain name to dhcp setts
Closes #3367.
Squashed commit of the following:
commit e2cabcac2d91af24b9e5f4ac8f78daf5e8d339b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:35:31 2022 +0300
home: imp test, skip dhcp test on windows
commit e58053f11e081630ad4e8d1e77a7a74226029db0
Merge: ff2fe87d 0b72bcc5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:10:25 2022 +0300
Merge branch 'master' into 3367-dhcp-local-domain-name
commit ff2fe87d8cab12e60d045be636e366e392d6d96f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 30 20:55:34 2021 +0300
home: mv local domain name to dhcp setts </s> remove data []byte
</s> add </s> remove data: []byte{},
</s> add </s> remove wantErrMsg string
</s> add </s> remove data: []byte("flase"),
wantErrMsg: `invalid nullBool value "flase"`,
</s> add wantErrMsg: `invalid nullBool value "invalid"`,
data: []byte("invalid"), | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90c17c79de14b51d1979c67650177b784216487c | internal/dhcpd/nullbool_test.go |
<mask> wantErrMsg string
<mask> want nullBool
<mask> }{{
<mask> name: "empty",
<mask> data: []byte{},
<mask> wantErrMsg: "",
<mask> want: nbNull,
<mask> }, {
<mask> name: "null",
<mask> data: []byte("null"),
</s> Pull request: home: mv local domain name to dhcp setts
Closes #3367.
Squashed commit of the following:
commit e2cabcac2d91af24b9e5f4ac8f78daf5e8d339b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:35:31 2022 +0300
home: imp test, skip dhcp test on windows
commit e58053f11e081630ad4e8d1e77a7a74226029db0
Merge: ff2fe87d 0b72bcc5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:10:25 2022 +0300
Merge branch 'master' into 3367-dhcp-local-domain-name
commit ff2fe87d8cab12e60d045be636e366e392d6d96f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 30 20:55:34 2021 +0300
home: mv local domain name to dhcp setts </s> remove data []byte
</s> add </s> remove data: []byte("null"),
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90c17c79de14b51d1979c67650177b784216487c | internal/dhcpd/nullbool_test.go | |
data: []byte{}, | <mask> name: "empty",
<mask> wantErrMsg: "",
<mask> want: nbNull,
<mask> }, {
<mask> name: "null",
<mask> wantErrMsg: "",
<mask> data: []byte("null"),
<mask> want: nbNull,
</s> Pull request: home: mv local domain name to dhcp setts
Closes #3367.
Squashed commit of the following:
commit e2cabcac2d91af24b9e5f4ac8f78daf5e8d339b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:35:31 2022 +0300
home: imp test, skip dhcp test on windows
commit e58053f11e081630ad4e8d1e77a7a74226029db0
Merge: ff2fe87d 0b72bcc5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:10:25 2022 +0300
Merge branch 'master' into 3367-dhcp-local-domain-name
commit ff2fe87d8cab12e60d045be636e366e392d6d96f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 30 20:55:34 2021 +0300
home: mv local domain name to dhcp setts </s> remove data: []byte("null"),
</s> add </s> remove data: []byte{},
</s> add </s> remove data: []byte("true"),
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90c17c79de14b51d1979c67650177b784216487c | internal/dhcpd/nullbool_test.go |
<mask> wantErrMsg: "",
<mask> want: nbNull,
<mask> }, {
<mask> name: "null",
<mask> data: []byte("null"),
<mask> wantErrMsg: "",
<mask> want: nbNull,
<mask> }, {
<mask> name: "true",
<mask> data: []byte("true"),
</s> Pull request: home: mv local domain name to dhcp setts
Closes #3367.
Squashed commit of the following:
commit e2cabcac2d91af24b9e5f4ac8f78daf5e8d339b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:35:31 2022 +0300
home: imp test, skip dhcp test on windows
commit e58053f11e081630ad4e8d1e77a7a74226029db0
Merge: ff2fe87d 0b72bcc5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:10:25 2022 +0300
Merge branch 'master' into 3367-dhcp-local-domain-name
commit ff2fe87d8cab12e60d045be636e366e392d6d96f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 30 20:55:34 2021 +0300
home: mv local domain name to dhcp setts </s> remove data: []byte("true"),
</s> add </s> remove data: []byte{},
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90c17c79de14b51d1979c67650177b784216487c | internal/dhcpd/nullbool_test.go | |
data: []byte("null"), | <mask> want: nbNull,
<mask> }, {
<mask> name: "null",
<mask> wantErrMsg: "",
<mask> want: nbNull,
<mask> }, {
<mask> name: "true",
<mask> wantErrMsg: "",
</s> Pull request: home: mv local domain name to dhcp setts
Closes #3367.
Squashed commit of the following:
commit e2cabcac2d91af24b9e5f4ac8f78daf5e8d339b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:35:31 2022 +0300
home: imp test, skip dhcp test on windows
commit e58053f11e081630ad4e8d1e77a7a74226029db0
Merge: ff2fe87d 0b72bcc5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:10:25 2022 +0300
Merge branch 'master' into 3367-dhcp-local-domain-name
commit ff2fe87d8cab12e60d045be636e366e392d6d96f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 30 20:55:34 2021 +0300
home: mv local domain name to dhcp setts </s> remove data: []byte("null"),
</s> add </s> remove data: []byte("true"),
</s> add </s> remove data: []byte{},
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90c17c79de14b51d1979c67650177b784216487c | internal/dhcpd/nullbool_test.go |
<mask> wantErrMsg: "",
<mask> want: nbNull,
<mask> }, {
<mask> name: "true",
<mask> data: []byte("true"),
<mask> wantErrMsg: "",
<mask> want: nbTrue,
<mask> }, {
<mask> name: "false",
<mask> data: []byte("false"),
</s> Pull request: home: mv local domain name to dhcp setts
Closes #3367.
Squashed commit of the following:
commit e2cabcac2d91af24b9e5f4ac8f78daf5e8d339b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:35:31 2022 +0300
home: imp test, skip dhcp test on windows
commit e58053f11e081630ad4e8d1e77a7a74226029db0
Merge: ff2fe87d 0b72bcc5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:10:25 2022 +0300
Merge branch 'master' into 3367-dhcp-local-domain-name
commit ff2fe87d8cab12e60d045be636e366e392d6d96f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 30 20:55:34 2021 +0300
home: mv local domain name to dhcp setts </s> remove data: []byte("false"),
</s> add </s> remove data: []byte("null"),
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90c17c79de14b51d1979c67650177b784216487c | internal/dhcpd/nullbool_test.go | |
data: []byte("true"), | <mask> name: "true",
<mask> wantErrMsg: "",
<mask> want: nbTrue,
<mask> }, {
<mask> name: "false",
<mask> wantErrMsg: "",
</s> Pull request: home: mv local domain name to dhcp setts
Closes #3367.
Squashed commit of the following:
commit e2cabcac2d91af24b9e5f4ac8f78daf5e8d339b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:35:31 2022 +0300
home: imp test, skip dhcp test on windows
commit e58053f11e081630ad4e8d1e77a7a74226029db0
Merge: ff2fe87d 0b72bcc5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:10:25 2022 +0300
Merge branch 'master' into 3367-dhcp-local-domain-name
commit ff2fe87d8cab12e60d045be636e366e392d6d96f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 30 20:55:34 2021 +0300
home: mv local domain name to dhcp setts </s> remove data: []byte("true"),
</s> add </s> remove data: []byte("false"),
</s> add </s> remove data: []byte("null"),
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90c17c79de14b51d1979c67650177b784216487c | internal/dhcpd/nullbool_test.go |
<mask> wantErrMsg: "",
<mask> want: nbTrue,
<mask> }, {
<mask> name: "false",
<mask> data: []byte("false"),
<mask> wantErrMsg: "",
<mask> want: nbFalse,
<mask> }, {
<mask> name: "invalid",
<mask> data: []byte("flase"),
</s> Pull request: home: mv local domain name to dhcp setts
Closes #3367.
Squashed commit of the following:
commit e2cabcac2d91af24b9e5f4ac8f78daf5e8d339b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:35:31 2022 +0300
home: imp test, skip dhcp test on windows
commit e58053f11e081630ad4e8d1e77a7a74226029db0
Merge: ff2fe87d 0b72bcc5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:10:25 2022 +0300
Merge branch 'master' into 3367-dhcp-local-domain-name
commit ff2fe87d8cab12e60d045be636e366e392d6d96f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 30 20:55:34 2021 +0300
home: mv local domain name to dhcp setts </s> remove data: []byte("true"),
</s> add </s> remove data: []byte("flase"),
wantErrMsg: `invalid nullBool value "flase"`,
</s> add wantErrMsg: `invalid nullBool value "invalid"`,
data: []byte("invalid"), </s> remove data: []byte("null"),
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90c17c79de14b51d1979c67650177b784216487c | internal/dhcpd/nullbool_test.go | |
data: []byte("false"), | <mask> want: nbTrue,
<mask> }, {
<mask> name: "false",
<mask> wantErrMsg: "",
<mask> want: nbFalse,
<mask> }, {
<mask> name: "invalid",
<mask> wantErrMsg: `invalid nullBool value "invalid"`,
<mask> data: []byte("invalid"),
<mask> want: nbNull,
</s> Pull request: home: mv local domain name to dhcp setts
Closes #3367.
Squashed commit of the following:
commit e2cabcac2d91af24b9e5f4ac8f78daf5e8d339b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:35:31 2022 +0300
home: imp test, skip dhcp test on windows
commit e58053f11e081630ad4e8d1e77a7a74226029db0
Merge: ff2fe87d 0b72bcc5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:10:25 2022 +0300
Merge branch 'master' into 3367-dhcp-local-domain-name
commit ff2fe87d8cab12e60d045be636e366e392d6d96f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 30 20:55:34 2021 +0300
home: mv local domain name to dhcp setts </s> remove data: []byte("flase"),
wantErrMsg: `invalid nullBool value "flase"`,
</s> add wantErrMsg: `invalid nullBool value "invalid"`,
data: []byte("invalid"), </s> remove data: []byte("false"),
</s> add </s> remove data: []byte("true"),
</s> add </s> remove data: []byte("null"),
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90c17c79de14b51d1979c67650177b784216487c | internal/dhcpd/nullbool_test.go |
wantErrMsg: `invalid nullBool value "invalid"`,
data: []byte("invalid"), | <mask> wantErrMsg: "",
<mask> want: nbFalse,
<mask> }, {
<mask> name: "invalid",
<mask> data: []byte("flase"),
<mask> wantErrMsg: `invalid nullBool value "flase"`,
<mask> want: nbNull,
<mask> }}
<mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
</s> Pull request: home: mv local domain name to dhcp setts
Closes #3367.
Squashed commit of the following:
commit e2cabcac2d91af24b9e5f4ac8f78daf5e8d339b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:35:31 2022 +0300
home: imp test, skip dhcp test on windows
commit e58053f11e081630ad4e8d1e77a7a74226029db0
Merge: ff2fe87d 0b72bcc5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:10:25 2022 +0300
Merge branch 'master' into 3367-dhcp-local-domain-name
commit ff2fe87d8cab12e60d045be636e366e392d6d96f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 30 20:55:34 2021 +0300
home: mv local domain name to dhcp setts </s> remove data: []byte("false"),
</s> add </s> remove data: []byte("null"),
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90c17c79de14b51d1979c67650177b784216487c | internal/dhcpd/nullbool_test.go |
// Set the broadcast bit in the DHCPNAK, so that the relay agent
// broadcasts it to the client, because the client may not have
// a correct network address or subnet mask, and the client may not
// be answering ARP requests. | <mask> IP: giaddr,
<mask> Port: dhcpv4.ServerPort,
<mask> }
<mask> if mtype == dhcpv4.MessageTypeNak {
<mask> // Set the broadcast bit in the DHCPNAK, so that the
<mask> // relay agent broadcasted it to the client, because the
<mask> // client may not have a correct network address or
<mask> // subnet mask, and the client may not be answering ARP
<mask> // requests.
<mask> resp.SetBroadcast()
<mask> }
<mask> case mtype == dhcpv4.MessageTypeNak:
<mask> // Broadcast any DHCPNAK messages to 0xffffffff.
<mask> case ciaddr != nil && !ciaddr.IsUnspecified():
</s> Pull request: home: mv local domain name to dhcp setts
Closes #3367.
Squashed commit of the following:
commit e2cabcac2d91af24b9e5f4ac8f78daf5e8d339b9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:35:31 2022 +0300
home: imp test, skip dhcp test on windows
commit e58053f11e081630ad4e8d1e77a7a74226029db0
Merge: ff2fe87d 0b72bcc5
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jan 25 19:10:25 2022 +0300
Merge branch 'master' into 3367-dhcp-local-domain-name
commit ff2fe87d8cab12e60d045be636e366e392d6d96f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Dec 30 20:55:34 2021 +0300
home: mv local domain name to dhcp setts </s> remove // ignores broadcasted packets when reading.
</s> add // ignores broadcast packets when reading. </s> remove s.conf.Enabled = conf.Enabled
s.conf.InterfaceName = conf.InterfaceName
s.conf.HTTPRegister = conf.HTTPRegister
s.conf.ConfigModified = conf.ConfigModified
s.conf.DBFilePath = filepath.Join(conf.WorkDir, dbFilename)
</s> add HTTPRegister: conf.HTTPRegister,
Enabled: conf.Enabled,
InterfaceName: conf.InterfaceName,
LocalDomainName: conf.LocalDomainName,
DBFilePath: filepath.Join(conf.WorkDir, dbFilename),
},
} </s> remove // TODO(e.burkov): leases.db isn't created on Windows so removing it
// causes an error. Split the test to make it run properly on different
// operating systems.
t.Cleanup(func() { _ = os.Remove("leases.db") })
</s> add testutil.CleanupAndRequireSuccess(t, func() (err error) {
return os.Remove("leases.db")
}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/90c17c79de14b51d1979c67650177b784216487c | internal/dhcpd/v4.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.