docstring_tokens stringlengths 18 16.9k | code_tokens stringlengths 75 1.81M | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|
keep keep keep keep replace keep keep keep keep keep | <mask> clients.etcHosts = etcHosts
<mask> clients.addFromConfig(objects)
<mask>
<mask> if !clients.testing {
<mask> clients.addFromDHCP()
<mask> if clients.dhcpServer != nil {
<mask> clients.dhcpServer.SetOnLeaseChanged(clients.onDHCPLeaseChanged)
<mask> }
<mask> if clients.etcHosts != nil {
<mask> clients.etcHosts.SetOnChanged(clients.onHostsChanged)
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove // now s.srv.Serve() will return
</s> add // Signal to the clients containers in packages home and dnsforward that
// it should remove all DHCP clients.
s.conf.notify(LeaseChangedRemovedAll)
</s> remove if s.tablePTR == nil {
</s> add if s.tableIPToHost == nil { </s> remove func (clients *clientsContainer) addFromDHCP() {
</s> add func (clients *clientsContainer) updateFromDHCP(add bool) { </s> remove host, ok = s.tablePTR[ip.String()]
</s> add host, ok = s.tableIPToHost[ip.String()] </s> remove // addFromDHCP adds the clients that have a non-empty hostname from the DHCP
</s> add // updateFromDHCP adds the clients that have a non-empty hostname from the DHCP </s> remove s.tablePTRLock.Lock()
defer s.tablePTRLock.Unlock()
</s> add s.tableIPToHostLock.Lock()
defer s.tableIPToHostLock.Unlock() | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/home/clients.go |
keep keep keep keep replace keep keep keep keep keep | <mask> switch flags {
<mask> case dhcpd.LeaseChangedAdded,
<mask> dhcpd.LeaseChangedAddedStatic,
<mask> dhcpd.LeaseChangedRemovedStatic:
<mask> clients.addFromDHCP()
<mask> }
<mask> }
<mask>
<mask> func (clients *clientsContainer) onHostsChanged() {
<mask> clients.addFromHostsFile()
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> add add := true </s> remove //
</s> add // Go on.
case dhcpd.LeaseChangedRemovedAll:
add = false </s> add func (s *Server) setTableHostToIP(t hostToIPTable) {
s.tableHostToIPLock.Lock()
defer s.tableHostToIPLock.Unlock()
s.tableHostToIP = t
}
func (s *Server) setTableIPToHost(t ipToHostTable) {
s.tableIPToHostLock.Lock()
defer s.tableIPToHostLock.Unlock()
s.tableIPToHost = t
}
</s> remove func (clients *clientsContainer) addFromDHCP() {
</s> add func (clients *clientsContainer) updateFromDHCP(add bool) { </s> remove // addFromDHCP adds the clients that have a non-empty hostname from the DHCP
</s> add // updateFromDHCP adds the clients that have a non-empty hostname from the DHCP </s> remove clients.addFromDHCP()
</s> add clients.updateFromDHCP(true) | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/home/clients.go |
keep keep keep keep replace keep replace keep keep keep | <mask>
<mask> log.Debug("clients: added %d client aliases from 'arp -a' command output", n)
<mask> }
<mask>
<mask> // addFromDHCP adds the clients that have a non-empty hostname from the DHCP
<mask> // server.
<mask> func (clients *clientsContainer) addFromDHCP() {
<mask> if clients.dhcpServer == nil {
<mask> return
<mask> }
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> add // Signal to the clients containers in packages home and dnsforward that
// it should reload the DHCP clients.
s.conf.notify(LeaseChangedAdded)
</s> remove // now s.srv.Serve() will return
</s> add // Signal to the clients containers in packages home and dnsforward that
// it should remove all DHCP clients.
s.conf.notify(LeaseChangedRemovedAll)
</s> remove host, ok = s.tablePTR[ip.String()]
</s> add host, ok = s.tableIPToHost[ip.String()] </s> remove s.tableHostToIPLock.Lock()
s.tableHostToIP = hostToIP
s.tableHostToIPLock.Unlock()
</s> add log.Debug("dns: added %d A/PTR entries from DHCP", len(ipToHost))
} </s> remove s.tablePTRLock.Lock()
defer s.tablePTRLock.Unlock()
</s> add s.tableIPToHostLock.Lock()
defer s.tableIPToHostLock.Unlock() | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/home/clients.go |
keep add keep keep keep keep keep | <mask> clients.rmHostsBySrc(ClientSourceDHCP)
<mask>
<mask> leases := clients.dhcpServer.Leases(dhcpd.LeasesAll)
<mask> n := 0
<mask> for _, l := range leases {
<mask> if l.Hostname == "" {
<mask> continue
</s> Pull request: all: do not use dhcp clients when server is off
Closes #2934.
Squashed commit of the following:
commit 856ea4ec0c3ffb1da447b93260da90d37cd5d45d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:39:46 2021 +0300
dnsforward: imp spacing
commit fa748e5a26cb6a38b5f87c5498287cb734ce7a59
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:33:44 2021 +0300
dnsforward: imp code
commit 771ba0de449faffff1cea523e8bbcc1039c992db
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Apr 15 17:06:03 2021 +0300
all: do not use dhcp clients when server is off </s> remove lowhost := strings.ToLower(l.Hostname)
</s> add for _, l := range ll {
if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) {
continue
} </s> remove for _, l := range ll {
if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) {
continue
}
</s> add ll := s.dhcpServer.Leases(dhcpd.LeasesAll) </s> remove hostToIP := make(map[string]net.IP)
m := make(map[string]string)
ll := s.dhcpServer.Leases(dhcpd.LeasesAll)
</s> add var hostToIP hostToIPTable
var ipToHost ipToHostTable
if add {
hostToIP = make(hostToIPTable)
ipToHost = make(ipToHostTable) </s> remove require.Nil(t, s.AddStaticLease(l))
</s> add err = s.AddStaticLease(l)
require.NoError(t, err) </s> remove tableHostToIP: map[string]net.IP{
</s> add tableHostToIP: hostToIPTable{ </s> remove tableHostToIP: map[string]net.IP{
</s> add tableHostToIP: hostToIPTable{ | https://github.com/AdguardTeam/AdGuardHome/commit/a1450c55955e51a81c138f565a7d0dab68fea6b0 | internal/home/clients.go |
keep keep keep replace replace replace replace replace keep keep replace replace replace replace keep | <mask> }
<mask>
<mask> const (
<mask> statusFound = 1 << iota
<mask> statusEnabledChanged
<mask> statusURLChanged
<mask> statusURLExists
<mask> statusUpdateRequired
<mask> )
<mask>
<mask> // Update properties for a filter specified by its URL
<mask> // Return status* flags.
<mask> func (d *DNSFilter) filterSetProperties(url string, newf FilterYAML, whitelist bool) int {
<mask> r := 0
<mask> d.filtersMu.Lock()
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove // Return TRUE if a filter with this URL exists
func (d *DNSFilter) filterExists(url string) bool {
</s> add // filterExists returns true if a filter with the same url exists in d. It's
// safe for concurrent use.
func (d *DNSFilter) filterExists(url string) (ok bool) { </s> remove return r | statusFound
</s> add return shouldRestart, err </s> remove func (d *DNSFilter) filterExistsNoLock(url string) bool {
</s> add // filterExistsLocked returns true if d contains the filter with the same url.
// d.filtersMu is expected to be locked.
func (d *DNSFilter) filterExistsLocked(url string) (ok bool) { </s> remove filt.checksum = 0
filt.RulesCount = 0
}
if filt.Enabled != newf.Enabled {
r |= statusEnabledChanged
filt.Enabled = newf.Enabled
if filt.Enabled {
if (r & statusURLChanged) == 0 {
err := d.load(filt)
if err != nil {
// TODO(e.burkov): It seems the error is only returned when
// the file exists and couldn't be open. Investigate and
// improve.
log.Error("loading filter %d: %s", filt.ID, err)
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0
r |= statusUpdateRequired
}
}
} else {
filt.unload()
</s> add filt.unload()
}
if filt.Enabled != newList.Enabled {
filt.Enabled = newList.Enabled
shouldRestart = true
}
if filt.Enabled {
if shouldRestart {
// Download the filter contents.
shouldRestart, err = d.update(filt) </s> remove r := d.filterExistsNoLock(url)
</s> add r := d.filterExistsLocked(url) | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter.go |
keep keep keep replace keep keep keep replace replace replace keep | <mask> defer d.filtersMu.Unlock()
<mask>
<mask> filters := d.Filters
<mask> if whitelist {
<mask> filters = d.WhitelistFilters
<mask> }
<mask>
<mask> i := slices.IndexFunc(filters, func(filt FilterYAML) bool {
<mask> return filt.URL == url
<mask> })
<mask> if i == -1 {
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove return 0
</s> add return false, errFilterNotExist </s> remove // Update properties for a filter specified by its URL
// Return status* flags.
func (d *DNSFilter) filterSetProperties(url string, newf FilterYAML, whitelist bool) int {
r := 0
</s> add // filterSetProperties searches for the particular filter list by url and sets
// the values of newList to it, updating afterwards if needed. It returns true
// if the update was performed and the filtering engine restart is required.
func (d *DNSFilter) filterSetProperties(
listURL string,
newList FilterYAML,
isAllowlist bool,
) (shouldRestart bool, err error) { </s> remove func (d *DNSFilter) filterExistsNoLock(url string) bool {
</s> add // filterExistsLocked returns true if d contains the filter with the same url.
// d.filtersMu is expected to be locked.
func (d *DNSFilter) filterExistsLocked(url string) (ok bool) { </s> remove if d.filterExistsNoLock(flt.URL) {
</s> add if d.filterExistsLocked(flt.URL) { </s> remove log.Debug("checking list at index %d: %v", i, flt)
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter.go |
keep replace keep keep keep keep replace replace keep keep keep keep | <mask> if i == -1 {
<mask> return 0
<mask> }
<mask>
<mask> filt := &filters[i]
<mask>
<mask> log.Debug("filter: set properties: %s: {%s %s %v}", filt.URL, newf.Name, newf.URL, newf.Enabled)
<mask> filt.Name = newf.Name
<mask>
<mask> if filt.URL != newf.URL {
<mask> r |= statusURLChanged | statusUpdateRequired
<mask> if d.filterExistsNoLock(newf.URL) {
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove if filt.URL != newf.URL {
r |= statusURLChanged | statusUpdateRequired
if d.filterExistsNoLock(newf.URL) {
return statusURLExists
</s> add if filt.URL != newList.URL {
if d.filterExistsLocked(newList.URL) {
return false, errFilterExists </s> remove i := slices.IndexFunc(filters, func(filt FilterYAML) bool {
return filt.URL == url
})
</s> add i := slices.IndexFunc(filters, func(filt FilterYAML) bool { return filt.URL == listURL }) </s> remove filt.checksum = 0
filt.RulesCount = 0
}
if filt.Enabled != newf.Enabled {
r |= statusEnabledChanged
filt.Enabled = newf.Enabled
if filt.Enabled {
if (r & statusURLChanged) == 0 {
err := d.load(filt)
if err != nil {
// TODO(e.burkov): It seems the error is only returned when
// the file exists and couldn't be open. Investigate and
// improve.
log.Error("loading filter %d: %s", filt.ID, err)
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0
r |= statusUpdateRequired
}
}
} else {
filt.unload()
</s> add filt.unload()
}
if filt.Enabled != newList.Enabled {
filt.Enabled = newList.Enabled
shouldRestart = true
}
if filt.Enabled {
if shouldRestart {
// Download the filter contents.
shouldRestart, err = d.update(filt) </s> remove filt.URL = newf.URL
filt.unload()
</s> add shouldRestart = true
filt.URL = newList.URL </s> remove if whitelist {
</s> add if isAllowlist { | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter.go |
keep keep keep keep replace replace replace replace keep keep replace replace keep keep keep | <mask>
<mask> log.Debug("filter: set properties: %s: {%s %s %v}", filt.URL, newf.Name, newf.URL, newf.Enabled)
<mask> filt.Name = newf.Name
<mask>
<mask> if filt.URL != newf.URL {
<mask> r |= statusURLChanged | statusUpdateRequired
<mask> if d.filterExistsNoLock(newf.URL) {
<mask> return statusURLExists
<mask> }
<mask>
<mask> filt.URL = newf.URL
<mask> filt.unload()
<mask> filt.LastUpdated = time.Time{}
<mask> filt.checksum = 0
<mask> filt.RulesCount = 0
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove log.Debug("filter: set properties: %s: {%s %s %v}", filt.URL, newf.Name, newf.URL, newf.Enabled)
filt.Name = newf.Name
</s> add filt.Name = newList.Name </s> remove return 0
</s> add return false, errFilterNotExist </s> remove filt.checksum = 0
filt.RulesCount = 0
}
if filt.Enabled != newf.Enabled {
r |= statusEnabledChanged
filt.Enabled = newf.Enabled
if filt.Enabled {
if (r & statusURLChanged) == 0 {
err := d.load(filt)
if err != nil {
// TODO(e.burkov): It seems the error is only returned when
// the file exists and couldn't be open. Investigate and
// improve.
log.Error("loading filter %d: %s", filt.ID, err)
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0
r |= statusUpdateRequired
}
}
} else {
filt.unload()
</s> add filt.unload()
}
if filt.Enabled != newList.Enabled {
filt.Enabled = newList.Enabled
shouldRestart = true
}
if filt.Enabled {
if shouldRestart {
// Download the filter contents.
shouldRestart, err = d.update(filt) </s> remove i := slices.IndexFunc(filters, func(filt FilterYAML) bool {
return filt.URL == url
})
</s> add i := slices.IndexFunc(filters, func(filt FilterYAML) bool { return filt.URL == listURL }) </s> remove
restart := (status & statusEnabledChanged) != 0
if (status&statusUpdateRequired) != 0 && fj.Data.Enabled {
// download new filter and apply its rules.
nUpdated := d.refreshFilters(!fj.Whitelist, fj.Whitelist, false)
// if at least 1 filter has been updated, refreshFilters() restarts the filtering automatically
// if not - we restart the filtering ourselves
restart = false
if nUpdated == 0 {
restart = true
}
}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter.go |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask>
<mask> filt.URL = newf.URL
<mask> filt.unload()
<mask> filt.LastUpdated = time.Time{}
<mask> filt.checksum = 0
<mask> filt.RulesCount = 0
<mask> }
<mask>
<mask> if filt.Enabled != newf.Enabled {
<mask> r |= statusEnabledChanged
<mask> filt.Enabled = newf.Enabled
<mask> if filt.Enabled {
<mask> if (r & statusURLChanged) == 0 {
<mask> err := d.load(filt)
<mask> if err != nil {
<mask> // TODO(e.burkov): It seems the error is only returned when
<mask> // the file exists and couldn't be open. Investigate and
<mask> // improve.
<mask> log.Error("loading filter %d: %s", filt.ID, err)
<mask>
<mask> filt.LastUpdated = time.Time{}
<mask> filt.checksum = 0
<mask> filt.RulesCount = 0
<mask> r |= statusUpdateRequired
<mask> }
<mask> }
<mask> } else {
<mask> filt.unload()
<mask> }
<mask> }
<mask>
<mask> return r | statusFound
<mask> }
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove filt.URL = newf.URL
filt.unload()
</s> add shouldRestart = true
filt.URL = newList.URL </s> remove if filt.URL != newf.URL {
r |= statusURLChanged | statusUpdateRequired
if d.filterExistsNoLock(newf.URL) {
return statusURLExists
</s> add if filt.URL != newList.URL {
if d.filterExistsLocked(newList.URL) {
return false, errFilterExists </s> remove
restart := (status & statusEnabledChanged) != 0
if (status&statusUpdateRequired) != 0 && fj.Data.Enabled {
// download new filter and apply its rules.
nUpdated := d.refreshFilters(!fj.Whitelist, fj.Whitelist, false)
// if at least 1 filter has been updated, refreshFilters() restarts the filtering automatically
// if not - we restart the filtering ourselves
restart = false
if nUpdated == 0 {
restart = true
}
}
</s> add </s> remove log.Debug("filter: set properties: %s: {%s %s %v}", filt.URL, newf.Name, newf.URL, newf.Enabled)
filt.Name = newf.Name
</s> add filt.Name = newList.Name </s> remove err = fmt.Errorf("invalid url: %s", err)
</s> add </s> remove return r | statusFound
</s> add return shouldRestart, err | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter.go |
keep keep add keep keep keep keep keep | <mask> // Download the filter contents.
<mask> shouldRestart, err = d.update(filt)
<mask> }
<mask> }
<mask>
<mask> return shouldRestart, err
<mask> }
<mask>
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove filt.checksum = 0
filt.RulesCount = 0
}
if filt.Enabled != newf.Enabled {
r |= statusEnabledChanged
filt.Enabled = newf.Enabled
if filt.Enabled {
if (r & statusURLChanged) == 0 {
err := d.load(filt)
if err != nil {
// TODO(e.burkov): It seems the error is only returned when
// the file exists and couldn't be open. Investigate and
// improve.
log.Error("loading filter %d: %s", filt.ID, err)
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0
r |= statusUpdateRequired
}
}
} else {
filt.unload()
</s> add filt.unload()
}
if filt.Enabled != newList.Enabled {
filt.Enabled = newList.Enabled
shouldRestart = true
}
if filt.Enabled {
if shouldRestart {
// Download the filter contents.
shouldRestart, err = d.update(filt) </s> remove return r | statusFound
</s> add return shouldRestart, err </s> remove filt.ID = assignUniqueFilterID()
</s> add </s> add Filter: Filter{
ID: assignUniqueFilterID(),
}, </s> remove err = fmt.Errorf("invalid url: %s", err)
</s> add </s> remove err = Context.clients.Close()
</s> add err = Context.clients.close() | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> filt.unload()
<mask> }
<mask> }
<mask>
<mask> return r | statusFound
<mask> }
<mask>
<mask> // Return TRUE if a filter with this URL exists
<mask> func (d *DNSFilter) filterExists(url string) bool {
<mask> d.filtersMu.RLock()
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove // Return TRUE if a filter with this URL exists
func (d *DNSFilter) filterExists(url string) bool {
</s> add // filterExists returns true if a filter with the same url exists in d. It's
// safe for concurrent use.
func (d *DNSFilter) filterExists(url string) (ok bool) { </s> remove r := d.filterExistsNoLock(url)
</s> add r := d.filterExistsLocked(url) </s> remove func (d *DNSFilter) filterExistsNoLock(url string) bool {
</s> add // filterExistsLocked returns true if d contains the filter with the same url.
// d.filtersMu is expected to be locked.
func (d *DNSFilter) filterExistsLocked(url string) (ok bool) { </s> remove filt.checksum = 0
filt.RulesCount = 0
}
if filt.Enabled != newf.Enabled {
r |= statusEnabledChanged
filt.Enabled = newf.Enabled
if filt.Enabled {
if (r & statusURLChanged) == 0 {
err := d.load(filt)
if err != nil {
// TODO(e.burkov): It seems the error is only returned when
// the file exists and couldn't be open. Investigate and
// improve.
log.Error("loading filter %d: %s", filt.ID, err)
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0
r |= statusUpdateRequired
}
}
} else {
filt.unload()
</s> add filt.unload()
}
if filt.Enabled != newList.Enabled {
filt.Enabled = newList.Enabled
shouldRestart = true
}
if filt.Enabled {
if shouldRestart {
// Download the filter contents.
shouldRestart, err = d.update(filt) </s> remove statusFound = 1 << iota
statusEnabledChanged
statusURLChanged
statusURLExists
statusUpdateRequired
</s> add // errFilterNotExist is returned from [filterSetProperties] when there are
// no lists with the desired URL to update.
//
// TODO(e.burkov): Use wherever the same error is needed.
errFilterNotExist errors.Error = "url doesn't exist"
// errFilterExists is returned from [filterSetProperties] when there is
// another filter having the same URL as the one updated.
//
// TODO(e.burkov): Use wherever the same error is needed.
errFilterExists errors.Error = "url already exists" </s> add } else {
// TODO(e.burkov): The validation of the contents of the new URL is
// currently skipped if the rule list is disabled. This makes it
// possible to set a bad rules source, but the validation should still
// kick in when the filter is enabled. Consider making changing this
// behavior to be stricter.
filt.unload() | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter.go |
keep keep keep keep replace replace keep keep keep replace keep keep | <mask>
<mask> return r | statusFound
<mask> }
<mask>
<mask> // Return TRUE if a filter with this URL exists
<mask> func (d *DNSFilter) filterExists(url string) bool {
<mask> d.filtersMu.RLock()
<mask> defer d.filtersMu.RUnlock()
<mask>
<mask> r := d.filterExistsNoLock(url)
<mask>
<mask> return r
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove return r | statusFound
</s> add return shouldRestart, err </s> remove func (d *DNSFilter) filterExistsNoLock(url string) bool {
</s> add // filterExistsLocked returns true if d contains the filter with the same url.
// d.filtersMu is expected to be locked.
func (d *DNSFilter) filterExistsLocked(url string) (ok bool) { </s> remove // Update properties for a filter specified by its URL
// Return status* flags.
func (d *DNSFilter) filterSetProperties(url string, newf FilterYAML, whitelist bool) int {
r := 0
</s> add // filterSetProperties searches for the particular filter list by url and sets
// the values of newList to it, updating afterwards if needed. It returns true
// if the update was performed and the filtering engine restart is required.
func (d *DNSFilter) filterSetProperties(
listURL string,
newList FilterYAML,
isAllowlist bool,
) (shouldRestart bool, err error) { </s> remove filt.checksum = 0
filt.RulesCount = 0
}
if filt.Enabled != newf.Enabled {
r |= statusEnabledChanged
filt.Enabled = newf.Enabled
if filt.Enabled {
if (r & statusURLChanged) == 0 {
err := d.load(filt)
if err != nil {
// TODO(e.burkov): It seems the error is only returned when
// the file exists and couldn't be open. Investigate and
// improve.
log.Error("loading filter %d: %s", filt.ID, err)
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0
r |= statusUpdateRequired
}
}
} else {
filt.unload()
</s> add filt.unload()
}
if filt.Enabled != newList.Enabled {
filt.Enabled = newList.Enabled
shouldRestart = true
}
if filt.Enabled {
if shouldRestart {
// Download the filter contents.
shouldRestart, err = d.update(filt) </s> remove statusFound = 1 << iota
statusEnabledChanged
statusURLChanged
statusURLExists
statusUpdateRequired
</s> add // errFilterNotExist is returned from [filterSetProperties] when there are
// no lists with the desired URL to update.
//
// TODO(e.burkov): Use wherever the same error is needed.
errFilterNotExist errors.Error = "url doesn't exist"
// errFilterExists is returned from [filterSetProperties] when there is
// another filter having the same URL as the one updated.
//
// TODO(e.burkov): Use wherever the same error is needed.
errFilterExists errors.Error = "url already exists" | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> return r
<mask> }
<mask>
<mask> func (d *DNSFilter) filterExistsNoLock(url string) bool {
<mask> for _, f := range d.Filters {
<mask> if f.URL == url {
<mask> return true
<mask> }
<mask> }
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove r := d.filterExistsNoLock(url)
</s> add r := d.filterExistsLocked(url) </s> remove // Return TRUE if a filter with this URL exists
func (d *DNSFilter) filterExists(url string) bool {
</s> add // filterExists returns true if a filter with the same url exists in d. It's
// safe for concurrent use.
func (d *DNSFilter) filterExists(url string) (ok bool) { </s> remove return r | statusFound
</s> add return shouldRestart, err </s> remove if whitelist {
</s> add if isAllowlist { </s> remove i := slices.IndexFunc(filters, func(filt FilterYAML) bool {
return filt.URL == url
})
</s> add i := slices.IndexFunc(filters, func(filt FilterYAML) bool { return filt.URL == listURL }) </s> remove return 0
</s> add return false, errFilterNotExist | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> d.filtersMu.Lock()
<mask> defer d.filtersMu.Unlock()
<mask>
<mask> // Check for duplicates
<mask> if d.filterExistsNoLock(flt.URL) {
<mask> return false
<mask> }
<mask>
<mask> if flt.white {
<mask> d.WhitelistFilters = append(d.WhitelistFilters, flt)
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove if whitelist {
</s> add if isAllowlist { </s> remove log.Debug("checking list at index %d: %v", i, flt)
</s> add </s> remove //
</s> add // Continue removing. </s> remove // remove all pending tasks
stop := false
for !stop {
</s> add // Remove all pending tasks.
removeLoop:
for { </s> remove i := slices.IndexFunc(filters, func(filt FilterYAML) bool {
return filt.URL == url
})
</s> add i := slices.IndexFunc(filters, func(filt FilterYAML) bool { return filt.URL == listURL }) </s> remove d.filtersInitializerLock.Lock() // prevent multiple writers from adding more than 1 task
</s> add d.filtersInitializerLock.Lock() | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter.go |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask>
<mask> return updated, isNetworkErr, ok
<mask> }
<mask>
<mask> // refreshFilters updates the lists and returns the number of updated ones.
<mask> // It's safe for concurrent use, but blocks at least until the previous
<mask> // refreshing is finished.
<mask> func (d *DNSFilter) refreshFilters(block, allow, force bool) (updated int) {
<mask> d.refreshLock.Lock()
<mask> defer d.refreshLock.Unlock()
<mask>
<mask> updated, _ = d.refreshFiltersIntl(block, allow, force)
<mask>
<mask> return updated
<mask> }
<mask>
<mask> // listsToUpdate returns the slice of filter lists that could be updated.
<mask> func (d *DNSFilter) listsToUpdate(filters *[]FilterYAML, force bool) (toUpd []FilterYAML) {
<mask> now := time.Now()
<mask>
<mask> d.filtersMu.RLock()
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove // Return TRUE if a filter with this URL exists
func (d *DNSFilter) filterExists(url string) bool {
</s> add // filterExists returns true if a filter with the same url exists in d. It's
// safe for concurrent use.
func (d *DNSFilter) filterExists(url string) (ok bool) { </s> remove func (d *DNSFilter) filterExistsNoLock(url string) bool {
</s> add // filterExistsLocked returns true if d contains the filter with the same url.
// d.filtersMu is expected to be locked.
func (d *DNSFilter) filterExistsLocked(url string) (ok bool) { </s> remove // Update properties for a filter specified by its URL
// Return status* flags.
func (d *DNSFilter) filterSetProperties(url string, newf FilterYAML, whitelist bool) int {
r := 0
</s> add // filterSetProperties searches for the particular filter list by url and sets
// the values of newList to it, updating afterwards if needed. It returns true
// if the update was performed and the filtering engine restart is required.
func (d *DNSFilter) filterSetProperties(
listURL string,
newList FilterYAML,
isAllowlist bool,
) (shouldRestart bool, err error) { </s> remove r := d.filterExistsNoLock(url)
</s> add r := d.filterExistsLocked(url) </s> remove statusFound = 1 << iota
statusEnabledChanged
statusURLChanged
statusURLExists
statusUpdateRequired
</s> add // errFilterNotExist is returned from [filterSetProperties] when there are
// no lists with the desired URL to update.
//
// TODO(e.burkov): Use wherever the same error is needed.
errFilterNotExist errors.Error = "url doesn't exist"
// errFilterExists is returned from [filterSetProperties] when there is
// another filter having the same URL as the one updated.
//
// TODO(e.burkov): Use wherever the same error is needed.
errFilterExists errors.Error = "url already exists" </s> add } else {
// TODO(e.burkov): The validation of the contents of the new URL is
// currently skipped if the rule list is disabled. This makes it
// possible to set a bad rules source, but the validation should still
// kick in when the filter is enabled. Consider making changing this
// behavior to be stricter.
filt.unload() | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> defer d.filtersMu.RUnlock()
<mask>
<mask> for i := range *filters {
<mask> flt := &(*filters)[i] // otherwise we will be operating on a copy
<mask> log.Debug("checking list at index %d: %v", i, flt)
<mask>
<mask> if !flt.Enabled {
<mask> continue
<mask> }
<mask>
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove if d.filterExistsNoLock(flt.URL) {
</s> add if d.filterExistsLocked(flt.URL) { </s> remove func (d *DNSFilter) filterExistsNoLock(url string) bool {
</s> add // filterExistsLocked returns true if d contains the filter with the same url.
// d.filtersMu is expected to be locked.
func (d *DNSFilter) filterExistsLocked(url string) (ok bool) { </s> remove // Return TRUE if a filter with this URL exists
func (d *DNSFilter) filterExists(url string) bool {
</s> add // filterExists returns true if a filter with the same url exists in d. It's
// safe for concurrent use.
func (d *DNSFilter) filterExists(url string) (ok bool) { </s> remove r := d.filterExistsNoLock(url)
</s> add r := d.filterExistsLocked(url) </s> remove if whitelist {
</s> add if isAllowlist { </s> remove i := slices.IndexFunc(filters, func(filt FilterYAML) bool {
return filt.URL == url
})
</s> add i := slices.IndexFunc(filters, func(filt FilterYAML) bool { return filt.URL == listURL }) | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter.go |
keep keep keep add keep keep keep keep keep | <mask> import (
<mask> "io/fs"
<mask> "net"
<mask> "net/http"
<mask> "net/url"
<mask> "os"
<mask> "path/filepath"
<mask> "testing"
<mask> "time"
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove "path"
</s> add </s> remove "github.com/AdguardTeam/golibs/netutil"
</s> add "github.com/AdguardTeam/AdGuardHome/internal/aghnet" </s> remove statusFound = 1 << iota
statusEnabledChanged
statusURLChanged
statusURLExists
statusUpdateRequired
</s> add // errFilterNotExist is returned from [filterSetProperties] when there are
// no lists with the desired URL to update.
//
// TODO(e.burkov): Use wherever the same error is needed.
errFilterNotExist errors.Error = "url doesn't exist"
// errFilterExists is returned from [filterSetProperties] when there is
// another filter having the same URL as the one updated.
//
// TODO(e.burkov): Use wherever the same error is needed.
errFilterExists errors.Error = "url already exists" </s> remove i := slices.IndexFunc(filters, func(filt FilterYAML) bool {
return filt.URL == url
})
</s> add i := slices.IndexFunc(filters, func(filt FilterYAML) bool { return filt.URL == listURL }) </s> remove r := d.filterExistsNoLock(url)
</s> add r := d.filterExistsLocked(url) </s> remove // Update properties for a filter specified by its URL
// Return status* flags.
func (d *DNSFilter) filterSetProperties(url string, newf FilterYAML, whitelist bool) int {
r := 0
</s> add // filterSetProperties searches for the particular filter list by url and sets
// the values of newList to it, updating afterwards if needed. It returns true
// if the update was performed and the filtering engine restart is required.
func (d *DNSFilter) filterSetProperties(
listURL string,
newList FilterYAML,
isAllowlist bool,
) (shouldRestart bool, err error) { | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter_test.go |
keep keep keep keep replace keep keep keep keep replace keep keep | <mask> "net"
<mask> "net/http"
<mask> "net/url"
<mask> "os"
<mask> "path"
<mask> "path/filepath"
<mask> "testing"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/golibs/netutil"
<mask> "github.com/AdguardTeam/golibs/testutil"
<mask> "github.com/stretchr/testify/assert"
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> add "net/netip" </s> remove const testFltsFileName = "1.txt"
func testStartFilterListener(t *testing.T, fltContent *[]byte) (l net.Listener) {
</s> add // serveFiltersLocally is a helper that concurrently listens on a free port to
// respond with fltContent. It also gracefully closes the listener when the
// test under t finishes.
func serveFiltersLocally(t *testing.T, fltContent []byte) (ipp netip.AddrPort) { </s> remove i := slices.IndexFunc(filters, func(filt FilterYAML) bool {
return filt.URL == url
})
</s> add i := slices.IndexFunc(filters, func(filt FilterYAML) bool { return filt.URL == listURL }) </s> remove r := d.filterExistsNoLock(url)
</s> add r := d.filterExistsLocked(url) </s> remove // Update properties for a filter specified by its URL
// Return status* flags.
func (d *DNSFilter) filterSetProperties(url string, newf FilterYAML, whitelist bool) int {
r := 0
</s> add // filterSetProperties searches for the particular filter list by url and sets
// the values of newList to it, updating afterwards if needed. It returns true
// if the update was performed and the filtering engine restart is required.
func (d *DNSFilter) filterSetProperties(
listURL string,
newList FilterYAML,
isAllowlist bool,
) (shouldRestart bool, err error) { | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter_test.go |
keep replace replace replace keep keep keep replace replace replace | <mask>
<mask> const testFltsFileName = "1.txt"
<mask>
<mask> func testStartFilterListener(t *testing.T, fltContent *[]byte) (l net.Listener) {
<mask> t.Helper()
<mask>
<mask> h := http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
<mask> n, werr := w.Write(*fltContent)
<mask> require.NoError(t, werr)
<mask> require.Equal(t, len(*fltContent), n)
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove var err error
l, err = net.Listen("tcp", ":0")
</s> add l, err := net.Listen("tcp", ":0") </s> remove return l
</s> add addr := l.Addr()
require.IsType(t, new(net.TCPAddr), addr)
return netip.AddrPortFrom(aghnet.IPv4Localhost(), uint16(addr.(*net.TCPAddr).Port)) </s> remove fltContent = []byte(`||example.com^`)
t.Cleanup(func() { fltContent = []byte(content) })
</s> add anotherContent := []byte(`||example.com^`)
oldURL := f.URL
ipp := serveFiltersLocally(t, anotherContent)
f.URL = (&url.URL{
Scheme: "http",
Host: ipp.String(),
}).String()
t.Cleanup(func() { f.URL = oldURL }) </s> remove go func() {
_ = http.Serve(l, h)
}()
</s> add go func() { _ = http.Serve(l, h) }() </s> remove Host: (&netutil.IPPort{
IP: net.IP{127, 0, 0, 1},
Port: l.Addr().(*net.TCPAddr).Port,
}).String(),
Path: path.Join(filterDir, testFltsFileName),
</s> add Host: addr.String(), | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter_test.go |
keep replace replace keep keep replace replace replace | <mask>
<mask> var err error
<mask> l, err = net.Listen("tcp", ":0")
<mask> require.NoError(t, err)
<mask>
<mask> go func() {
<mask> _ = http.Serve(l, h)
<mask> }()
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove n, werr := w.Write(*fltContent)
require.NoError(t, werr)
require.Equal(t, len(*fltContent), n)
</s> add pt := testutil.PanicT{}
n, werr := w.Write(fltContent)
require.NoError(pt, werr)
require.Equal(pt, len(fltContent), n) </s> remove return l
</s> add addr := l.Addr()
require.IsType(t, new(net.TCPAddr), addr)
return netip.AddrPortFrom(aghnet.IPv4Localhost(), uint16(addr.(*net.TCPAddr).Port)) </s> remove err = fmt.Errorf("invalid url: %s", err)
</s> add </s> remove err = Context.clients.Close()
</s> add err = Context.clients.close() </s> remove filt.checksum = 0
filt.RulesCount = 0
}
if filt.Enabled != newf.Enabled {
r |= statusEnabledChanged
filt.Enabled = newf.Enabled
if filt.Enabled {
if (r & statusURLChanged) == 0 {
err := d.load(filt)
if err != nil {
// TODO(e.burkov): It seems the error is only returned when
// the file exists and couldn't be open. Investigate and
// improve.
log.Error("loading filter %d: %s", filt.ID, err)
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0
r |= statusUpdateRequired
}
}
} else {
filt.unload()
</s> add filt.unload()
}
if filt.Enabled != newList.Enabled {
filt.Enabled = newList.Enabled
shouldRestart = true
}
if filt.Enabled {
if shouldRestart {
// Download the filter contents.
shouldRestart, err = d.update(filt) | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> _ = http.Serve(l, h)
<mask> }()
<mask> testutil.CleanupAndRequireSuccess(t, l.Close)
<mask>
<mask> return l
<mask> }
<mask>
<mask> func TestFilters(t *testing.T) {
<mask> const content = `||example.org^$third-party
<mask> # Inline comment example
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove go func() {
_ = http.Serve(l, h)
}()
</s> add go func() { _ = http.Serve(l, h) }() </s> remove var err error
l, err = net.Listen("tcp", ":0")
</s> add l, err := net.Listen("tcp", ":0") </s> remove fltContent = []byte(`||example.com^`)
t.Cleanup(func() { fltContent = []byte(content) })
</s> add anotherContent := []byte(`||example.com^`)
oldURL := f.URL
ipp := serveFiltersLocally(t, anotherContent)
f.URL = (&url.URL{
Scheme: "http",
Host: ipp.String(),
}).String()
t.Cleanup(func() { f.URL = oldURL }) </s> remove const testFltsFileName = "1.txt"
func testStartFilterListener(t *testing.T, fltContent *[]byte) (l net.Listener) {
</s> add // serveFiltersLocally is a helper that concurrently listens on a free port to
// respond with fltContent. It also gracefully closes the listener when the
// test under t finishes.
func serveFiltersLocally(t *testing.T, fltContent []byte) (ipp netip.AddrPort) { </s> remove filt.URL = newf.URL
filt.unload()
</s> add shouldRestart = true
filt.URL = newList.URL </s> remove filt.checksum = 0
filt.RulesCount = 0
}
if filt.Enabled != newf.Enabled {
r |= statusEnabledChanged
filt.Enabled = newf.Enabled
if filt.Enabled {
if (r & statusURLChanged) == 0 {
err := d.load(filt)
if err != nil {
// TODO(e.burkov): It seems the error is only returned when
// the file exists and couldn't be open. Investigate and
// improve.
log.Error("loading filter %d: %s", filt.ID, err)
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0
r |= statusUpdateRequired
}
}
} else {
filt.unload()
</s> add filt.unload()
}
if filt.Enabled != newList.Enabled {
filt.Enabled = newList.Enabled
shouldRestart = true
}
if filt.Enabled {
if shouldRestart {
// Download the filter contents.
shouldRestart, err = d.update(filt) | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> `
<mask>
<mask> fltContent := []byte(content)
<mask>
<mask> l := testStartFilterListener(t, &fltContent)
<mask>
<mask> tempDir := t.TempDir()
<mask>
<mask> filters, err := New(&Config{
<mask> DataDir: tempDir,
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove fltContent = []byte(`||example.com^`)
t.Cleanup(func() { fltContent = []byte(content) })
</s> add anotherContent := []byte(`||example.com^`)
oldURL := f.URL
ipp := serveFiltersLocally(t, anotherContent)
f.URL = (&url.URL{
Scheme: "http",
Host: ipp.String(),
}).String()
t.Cleanup(func() { f.URL = oldURL }) </s> remove n, werr := w.Write(*fltContent)
require.NoError(t, werr)
require.Equal(t, len(*fltContent), n)
</s> add pt := testutil.PanicT{}
n, werr := w.Write(fltContent)
require.NoError(pt, werr)
require.Equal(pt, len(fltContent), n) </s> remove const testFltsFileName = "1.txt"
func testStartFilterListener(t *testing.T, fltContent *[]byte) (l net.Listener) {
</s> add // serveFiltersLocally is a helper that concurrently listens on a free port to
// respond with fltContent. It also gracefully closes the listener when the
// test under t finishes.
func serveFiltersLocally(t *testing.T, fltContent []byte) (ipp netip.AddrPort) { </s> remove return l
</s> add addr := l.Addr()
require.IsType(t, new(net.TCPAddr), addr)
return netip.AddrPortFrom(aghnet.IPv4Localhost(), uint16(addr.(*net.TCPAddr).Port)) </s> remove i := slices.IndexFunc(filters, func(filt FilterYAML) bool {
return filt.URL == url
})
</s> add i := slices.IndexFunc(filters, func(filt FilterYAML) bool { return filt.URL == listURL }) </s> remove return
}
if (status & statusURLExists) != 0 {
aghhttp.Error(r, w, http.StatusBadRequest, "URL already exists")
</s> add restart, err := d.filterSetProperties(fj.URL, filt, fj.Whitelist)
if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, err.Error()) | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter_test.go |
keep keep keep keep replace replace replace replace replace keep keep keep keep keep | <mask>
<mask> f := &FilterYAML{
<mask> URL: (&url.URL{
<mask> Scheme: "http",
<mask> Host: (&netutil.IPPort{
<mask> IP: net.IP{127, 0, 0, 1},
<mask> Port: l.Addr().(*net.TCPAddr).Port,
<mask> }).String(),
<mask> Path: path.Join(filterDir, testFltsFileName),
<mask> }).String(),
<mask> }
<mask>
<mask> updateAndAssert := func(t *testing.T, want require.BoolAssertionFunc, wantRulesCount int) {
<mask> var ok bool
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove fltContent = []byte(`||example.com^`)
t.Cleanup(func() { fltContent = []byte(content) })
</s> add anotherContent := []byte(`||example.com^`)
oldURL := f.URL
ipp := serveFiltersLocally(t, anotherContent)
f.URL = (&url.URL{
Scheme: "http",
Host: ipp.String(),
}).String()
t.Cleanup(func() { f.URL = oldURL }) </s> remove n, werr := w.Write(*fltContent)
require.NoError(t, werr)
require.Equal(t, len(*fltContent), n)
</s> add pt := testutil.PanicT{}
n, werr := w.Write(fltContent)
require.NoError(pt, werr)
require.Equal(pt, len(fltContent), n) </s> remove func (d *DNSFilter) filterExistsNoLock(url string) bool {
</s> add // filterExistsLocked returns true if d contains the filter with the same url.
// d.filtersMu is expected to be locked.
func (d *DNSFilter) filterExistsLocked(url string) (ok bool) { </s> remove i := slices.IndexFunc(filters, func(filt FilterYAML) bool {
return filt.URL == url
})
</s> add i := slices.IndexFunc(filters, func(filt FilterYAML) bool { return filt.URL == listURL }) </s> remove r := d.filterExistsNoLock(url)
</s> add r := d.filterExistsLocked(url) </s> remove // refreshFilters updates the lists and returns the number of updated ones.
// It's safe for concurrent use, but blocks at least until the previous
// refreshing is finished.
func (d *DNSFilter) refreshFilters(block, allow, force bool) (updated int) {
d.refreshLock.Lock()
defer d.refreshLock.Unlock()
updated, _ = d.refreshFiltersIntl(block, allow, force)
return updated
}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter_test.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> updateAndAssert(t, require.False, 3)
<mask> })
<mask>
<mask> t.Run("refresh_actually", func(t *testing.T) {
<mask> fltContent = []byte(`||example.com^`)
<mask> t.Cleanup(func() { fltContent = []byte(content) })
<mask>
<mask> updateAndAssert(t, require.True, 1)
<mask> })
<mask>
<mask> t.Run("load_unload", func(t *testing.T) {
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove n, werr := w.Write(*fltContent)
require.NoError(t, werr)
require.Equal(t, len(*fltContent), n)
</s> add pt := testutil.PanicT{}
n, werr := w.Write(fltContent)
require.NoError(pt, werr)
require.Equal(pt, len(fltContent), n) </s> remove i := slices.IndexFunc(filters, func(filt FilterYAML) bool {
return filt.URL == url
})
</s> add i := slices.IndexFunc(filters, func(filt FilterYAML) bool { return filt.URL == listURL }) </s> remove return l
</s> add addr := l.Addr()
require.IsType(t, new(net.TCPAddr), addr)
return netip.AddrPortFrom(aghnet.IPv4Localhost(), uint16(addr.(*net.TCPAddr).Port)) </s> remove var err error
l, err = net.Listen("tcp", ":0")
</s> add l, err := net.Listen("tcp", ":0") </s> remove const testFltsFileName = "1.txt"
func testStartFilterListener(t *testing.T, fltContent *[]byte) (l net.Listener) {
</s> add // serveFiltersLocally is a helper that concurrently listens on a free port to
// respond with fltContent. It also gracefully closes the listener when the
// test under t finishes.
func serveFiltersLocally(t *testing.T, fltContent []byte) (ipp netip.AddrPort) { </s> remove l := testStartFilterListener(t, &fltContent)
</s> add addr := serveFiltersLocally(t, fltContent) | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filter_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> allowFilters: allowFilters,
<mask> blockFilters: blockFilters,
<mask> }
<mask>
<mask> d.filtersInitializerLock.Lock() // prevent multiple writers from adding more than 1 task
<mask> defer d.filtersInitializerLock.Unlock()
<mask>
<mask> // remove all pending tasks
<mask> stop := false
<mask> for !stop {
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove // remove all pending tasks
stop := false
for !stop {
</s> add // Remove all pending tasks.
removeLoop:
for { </s> remove //
</s> add // Continue removing. </s> remove if d.filterExistsNoLock(flt.URL) {
</s> add if d.filterExistsLocked(flt.URL) { </s> remove // Close gracefully closes all the client-specific upstream configurations of
</s> add // close gracefully closes all the client-specific upstream configurations of </s> remove
restart := (status & statusEnabledChanged) != 0
if (status&statusUpdateRequired) != 0 && fj.Data.Enabled {
// download new filter and apply its rules.
nUpdated := d.refreshFilters(!fj.Whitelist, fj.Whitelist, false)
// if at least 1 filter has been updated, refreshFilters() restarts the filtering automatically
// if not - we restart the filtering ourselves
restart = false
if nUpdated == 0 {
restart = true
}
}
</s> add </s> remove log.Debug("checking list at index %d: %v", i, flt)
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filtering.go |
keep keep replace replace replace keep keep replace keep | <mask> defer d.filtersInitializerLock.Unlock()
<mask>
<mask> // remove all pending tasks
<mask> stop := false
<mask> for !stop {
<mask> select {
<mask> case <-d.filtersInitializerChan:
<mask> //
<mask> default:
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove d.filtersInitializerLock.Lock() // prevent multiple writers from adding more than 1 task
</s> add d.filtersInitializerLock.Lock() </s> remove stop = true
</s> add break removeLoop </s> remove if d.filterExistsNoLock(flt.URL) {
</s> add if d.filterExistsLocked(flt.URL) { </s> remove log.Debug("checking list at index %d: %v", i, flt)
</s> add </s> remove // Close gracefully closes all the client-specific upstream configurations of
</s> add // close gracefully closes all the client-specific upstream configurations of | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filtering.go |
keep keep keep keep replace keep keep keep keep keep | <mask> select {
<mask> case <-d.filtersInitializerChan:
<mask> //
<mask> default:
<mask> stop = true
<mask> }
<mask> }
<mask>
<mask> d.filtersInitializerChan <- params
<mask> return nil
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove //
</s> add // Continue removing. </s> remove // remove all pending tasks
stop := false
for !stop {
</s> add // Remove all pending tasks.
removeLoop:
for { </s> remove err = Context.clients.Close()
</s> add err = Context.clients.close() </s> remove err = fmt.Errorf("invalid url: %s", err)
</s> add </s> remove filt.URL = newf.URL
filt.unload()
</s> add shouldRestart = true
filt.URL = newList.URL </s> remove filt.checksum = 0
filt.RulesCount = 0
}
if filt.Enabled != newf.Enabled {
r |= statusEnabledChanged
filt.Enabled = newf.Enabled
if filt.Enabled {
if (r & statusURLChanged) == 0 {
err := d.load(filt)
if err != nil {
// TODO(e.burkov): It seems the error is only returned when
// the file exists and couldn't be open. Investigate and
// improve.
log.Error("loading filter %d: %s", filt.ID, err)
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0
r |= statusUpdateRequired
}
}
} else {
filt.unload()
</s> add filt.unload()
}
if filt.Enabled != newList.Enabled {
filt.Enabled = newList.Enabled
shouldRestart = true
}
if filt.Enabled {
if shouldRestart {
// Download the filter contents.
shouldRestart, err = d.update(filt) | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filtering.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> err := d.initFiltering(allowFilters, blockFilters)
<mask> if err != nil {
<mask> log.Error("Can't initialize filtering subsystem: %s", err)
<mask> return err
<mask> }
<mask>
<mask> return nil
<mask> }
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove err = fmt.Errorf("invalid url: %s", err)
</s> add </s> remove err = Context.clients.Close()
</s> add err = Context.clients.close() </s> remove return
}
if (status & statusURLExists) != 0 {
aghhttp.Error(r, w, http.StatusBadRequest, "URL already exists")
</s> add restart, err := d.filterSetProperties(fj.URL, filt, fj.Whitelist)
if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, err.Error()) </s> remove filt.checksum = 0
filt.RulesCount = 0
}
if filt.Enabled != newf.Enabled {
r |= statusEnabledChanged
filt.Enabled = newf.Enabled
if filt.Enabled {
if (r & statusURLChanged) == 0 {
err := d.load(filt)
if err != nil {
// TODO(e.burkov): It seems the error is only returned when
// the file exists and couldn't be open. Investigate and
// improve.
log.Error("loading filter %d: %s", filt.ID, err)
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0
r |= statusUpdateRequired
}
}
} else {
filt.unload()
</s> add filt.unload()
}
if filt.Enabled != newList.Enabled {
filt.Enabled = newList.Enabled
shouldRestart = true
}
if filt.Enabled {
if shouldRestart {
// Download the filter contents.
shouldRestart, err = d.update(filt) </s> remove filt.ID = assignUniqueFilterID()
</s> add </s> remove stop = true
</s> add break removeLoop | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/filtering.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> err = validateFilterURL(fj.URL)
<mask> if err != nil {
<mask> err = fmt.Errorf("invalid url: %s", err)
<mask> aghhttp.Error(r, w, http.StatusBadRequest, "%s", err)
<mask>
<mask> return
<mask> }
<mask>
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove return
}
if (status & statusURLExists) != 0 {
aghhttp.Error(r, w, http.StatusBadRequest, "URL already exists")
</s> add restart, err := d.filterSetProperties(fj.URL, filt, fj.Whitelist)
if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, err.Error()) </s> remove log.Error("Can't initialize filtering subsystem: %s", err)
</s> add log.Error("filtering: can't initialize filtering subsystem: %s", err)
</s> remove err = Context.clients.Close()
</s> add err = Context.clients.close() </s> remove status := d.filterSetProperties(fj.URL, filt, fj.Whitelist)
if (status & statusFound) == 0 {
aghhttp.Error(r, w, http.StatusBadRequest, "URL doesn't exist")
</s> add </s> remove filt.checksum = 0
filt.RulesCount = 0
}
if filt.Enabled != newf.Enabled {
r |= statusEnabledChanged
filt.Enabled = newf.Enabled
if filt.Enabled {
if (r & statusURLChanged) == 0 {
err := d.load(filt)
if err != nil {
// TODO(e.burkov): It seems the error is only returned when
// the file exists and couldn't be open. Investigate and
// improve.
log.Error("loading filter %d: %s", filt.ID, err)
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0
r |= statusUpdateRequired
}
}
} else {
filt.unload()
</s> add filt.unload()
}
if filt.Enabled != newList.Enabled {
filt.Enabled = newList.Enabled
shouldRestart = true
}
if filt.Enabled {
if shouldRestart {
// Download the filter contents.
shouldRestart, err = d.update(filt) </s> remove go func() {
_ = http.Serve(l, h)
}()
</s> add go func() { _ = http.Serve(l, h) }() | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/http.go |
keep keep add keep keep keep keep | <mask> URL: fj.URL,
<mask> Name: fj.Name,
<mask> white: fj.Whitelist,
<mask> }
<mask>
<mask> // Download the filter contents
<mask> ok, err := d.update(&filt)
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove filt.ID = assignUniqueFilterID()
</s> add </s> add } else {
// TODO(e.burkov): The validation of the contents of the new URL is
// currently skipped if the rule list is disabled. This makes it
// possible to set a bad rules source, but the validation should still
// kick in when the filter is enabled. Consider making changing this
// behavior to be stricter.
filt.unload() </s> remove status := d.filterSetProperties(fj.URL, filt, fj.Whitelist)
if (status & statusFound) == 0 {
aghhttp.Error(r, w, http.StatusBadRequest, "URL doesn't exist")
</s> add </s> remove
restart := (status & statusEnabledChanged) != 0
if (status&statusUpdateRequired) != 0 && fj.Data.Enabled {
// download new filter and apply its rules.
nUpdated := d.refreshFilters(!fj.Whitelist, fj.Whitelist, false)
// if at least 1 filter has been updated, refreshFilters() restarts the filtering automatically
// if not - we restart the filtering ourselves
restart = false
if nUpdated == 0 {
restart = true
}
}
</s> add </s> remove filt.checksum = 0
filt.RulesCount = 0
}
if filt.Enabled != newf.Enabled {
r |= statusEnabledChanged
filt.Enabled = newf.Enabled
if filt.Enabled {
if (r & statusURLChanged) == 0 {
err := d.load(filt)
if err != nil {
// TODO(e.burkov): It seems the error is only returned when
// the file exists and couldn't be open. Investigate and
// improve.
log.Error("loading filter %d: %s", filt.ID, err)
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0
r |= statusUpdateRequired
}
}
} else {
filt.unload()
</s> add filt.unload()
}
if filt.Enabled != newList.Enabled {
filt.Enabled = newList.Enabled
shouldRestart = true
}
if filt.Enabled {
if shouldRestart {
// Download the filter contents.
shouldRestart, err = d.update(filt) </s> remove Host: (&netutil.IPPort{
IP: net.IP{127, 0, 0, 1},
Port: l.Addr().(*net.TCPAddr).Port,
}).String(),
Path: path.Join(filterDir, testFltsFileName),
</s> add Host: addr.String(), | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/http.go |
keep keep keep keep replace keep keep keep keep keep | <mask> URL: fj.URL,
<mask> Name: fj.Name,
<mask> white: fj.Whitelist,
<mask> }
<mask> filt.ID = assignUniqueFilterID()
<mask>
<mask> // Download the filter contents
<mask> ok, err := d.update(&filt)
<mask> if err != nil {
<mask> aghhttp.Error(
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> add Filter: Filter{
ID: assignUniqueFilterID(),
}, </s> remove filt.checksum = 0
filt.RulesCount = 0
}
if filt.Enabled != newf.Enabled {
r |= statusEnabledChanged
filt.Enabled = newf.Enabled
if filt.Enabled {
if (r & statusURLChanged) == 0 {
err := d.load(filt)
if err != nil {
// TODO(e.burkov): It seems the error is only returned when
// the file exists and couldn't be open. Investigate and
// improve.
log.Error("loading filter %d: %s", filt.ID, err)
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0
r |= statusUpdateRequired
}
}
} else {
filt.unload()
</s> add filt.unload()
}
if filt.Enabled != newList.Enabled {
filt.Enabled = newList.Enabled
shouldRestart = true
}
if filt.Enabled {
if shouldRestart {
// Download the filter contents.
shouldRestart, err = d.update(filt) </s> remove err = Context.clients.Close()
</s> add err = Context.clients.close() </s> add } else {
// TODO(e.burkov): The validation of the contents of the new URL is
// currently skipped if the rule list is disabled. This makes it
// possible to set a bad rules source, but the validation should still
// kick in when the filter is enabled. Consider making changing this
// behavior to be stricter.
filt.unload() </s> remove err = fmt.Errorf("invalid url: %s", err)
</s> add </s> remove
restart := (status & statusEnabledChanged) != 0
if (status&statusUpdateRequired) != 0 && fj.Data.Enabled {
// download new filter and apply its rules.
nUpdated := d.refreshFilters(!fj.Whitelist, fj.Whitelist, false)
// if at least 1 filter has been updated, refreshFilters() restarts the filtering automatically
// if not - we restart the filtering ourselves
restart = false
if nUpdated == 0 {
restart = true
}
}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/http.go |
keep keep keep keep replace replace replace keep replace replace replace replace keep keep keep | <mask> Enabled: fj.Data.Enabled,
<mask> Name: fj.Data.Name,
<mask> URL: fj.Data.URL,
<mask> }
<mask> status := d.filterSetProperties(fj.URL, filt, fj.Whitelist)
<mask> if (status & statusFound) == 0 {
<mask> aghhttp.Error(r, w, http.StatusBadRequest, "URL doesn't exist")
<mask>
<mask> return
<mask> }
<mask> if (status & statusURLExists) != 0 {
<mask> aghhttp.Error(r, w, http.StatusBadRequest, "URL already exists")
<mask>
<mask> return
<mask> }
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove err = fmt.Errorf("invalid url: %s", err)
</s> add </s> remove
restart := (status & statusEnabledChanged) != 0
if (status&statusUpdateRequired) != 0 && fj.Data.Enabled {
// download new filter and apply its rules.
nUpdated := d.refreshFilters(!fj.Whitelist, fj.Whitelist, false)
// if at least 1 filter has been updated, refreshFilters() restarts the filtering automatically
// if not - we restart the filtering ourselves
restart = false
if nUpdated == 0 {
restart = true
}
}
</s> add </s> remove filt.checksum = 0
filt.RulesCount = 0
}
if filt.Enabled != newf.Enabled {
r |= statusEnabledChanged
filt.Enabled = newf.Enabled
if filt.Enabled {
if (r & statusURLChanged) == 0 {
err := d.load(filt)
if err != nil {
// TODO(e.burkov): It seems the error is only returned when
// the file exists and couldn't be open. Investigate and
// improve.
log.Error("loading filter %d: %s", filt.ID, err)
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0
r |= statusUpdateRequired
}
}
} else {
filt.unload()
</s> add filt.unload()
}
if filt.Enabled != newList.Enabled {
filt.Enabled = newList.Enabled
shouldRestart = true
}
if filt.Enabled {
if shouldRestart {
// Download the filter contents.
shouldRestart, err = d.update(filt) </s> remove i := slices.IndexFunc(filters, func(filt FilterYAML) bool {
return filt.URL == url
})
</s> add i := slices.IndexFunc(filters, func(filt FilterYAML) bool { return filt.URL == listURL }) </s> remove return 0
</s> add return false, errFilterNotExist | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/http.go |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> return
<mask> }
<mask>
<mask> d.ConfigModified()
<mask>
<mask> restart := (status & statusEnabledChanged) != 0
<mask> if (status&statusUpdateRequired) != 0 && fj.Data.Enabled {
<mask> // download new filter and apply its rules.
<mask> nUpdated := d.refreshFilters(!fj.Whitelist, fj.Whitelist, false)
<mask> // if at least 1 filter has been updated, refreshFilters() restarts the filtering automatically
<mask> // if not - we restart the filtering ourselves
<mask> restart = false
<mask> if nUpdated == 0 {
<mask> restart = true
<mask> }
<mask> }
<mask>
<mask> if restart {
<mask> d.EnableFilters(true)
<mask> }
<mask> }
<mask>
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove filt.checksum = 0
filt.RulesCount = 0
}
if filt.Enabled != newf.Enabled {
r |= statusEnabledChanged
filt.Enabled = newf.Enabled
if filt.Enabled {
if (r & statusURLChanged) == 0 {
err := d.load(filt)
if err != nil {
// TODO(e.burkov): It seems the error is only returned when
// the file exists and couldn't be open. Investigate and
// improve.
log.Error("loading filter %d: %s", filt.ID, err)
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0
r |= statusUpdateRequired
}
}
} else {
filt.unload()
</s> add filt.unload()
}
if filt.Enabled != newList.Enabled {
filt.Enabled = newList.Enabled
shouldRestart = true
}
if filt.Enabled {
if shouldRestart {
// Download the filter contents.
shouldRestart, err = d.update(filt) </s> remove return
}
if (status & statusURLExists) != 0 {
aghhttp.Error(r, w, http.StatusBadRequest, "URL already exists")
</s> add restart, err := d.filterSetProperties(fj.URL, filt, fj.Whitelist)
if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, err.Error()) </s> remove // Update properties for a filter specified by its URL
// Return status* flags.
func (d *DNSFilter) filterSetProperties(url string, newf FilterYAML, whitelist bool) int {
r := 0
</s> add // filterSetProperties searches for the particular filter list by url and sets
// the values of newList to it, updating afterwards if needed. It returns true
// if the update was performed and the filtering engine restart is required.
func (d *DNSFilter) filterSetProperties(
listURL string,
newList FilterYAML,
isAllowlist bool,
) (shouldRestart bool, err error) { </s> remove status := d.filterSetProperties(fj.URL, filt, fj.Whitelist)
if (status & statusFound) == 0 {
aghhttp.Error(r, w, http.StatusBadRequest, "URL doesn't exist")
</s> add </s> remove log.Error("Can't initialize filtering subsystem: %s", err)
</s> add log.Error("filtering: can't initialize filtering subsystem: %s", err)
</s> remove // refreshFilters updates the lists and returns the number of updated ones.
// It's safe for concurrent use, but blocks at least until the previous
// refreshing is finished.
func (d *DNSFilter) refreshFilters(block, allow, force bool) (updated int) {
d.refreshLock.Lock()
defer d.refreshLock.Unlock()
updated, _ = d.refreshFiltersIntl(block, allow, force)
return updated
}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/filtering/http.go |
keep keep replace keep replace keep keep keep keep | <mask> }
<mask>
<mask> // Close gracefully closes all the client-specific upstream configurations of
<mask> // the persistent clients.
<mask> func (clients *clientsContainer) Close() (err error) {
<mask> persistent := maps.Values(clients.list)
<mask> slices.SortFunc(persistent, func(a, b *Client) (less bool) { return a.Name < b.Name })
<mask>
<mask> var errs []error
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove // refreshFilters updates the lists and returns the number of updated ones.
// It's safe for concurrent use, but blocks at least until the previous
// refreshing is finished.
func (d *DNSFilter) refreshFilters(block, allow, force bool) (updated int) {
d.refreshLock.Lock()
defer d.refreshLock.Unlock()
updated, _ = d.refreshFiltersIntl(block, allow, force)
return updated
}
</s> add </s> remove func (d *DNSFilter) filterExistsNoLock(url string) bool {
</s> add // filterExistsLocked returns true if d contains the filter with the same url.
// d.filtersMu is expected to be locked.
func (d *DNSFilter) filterExistsLocked(url string) (ok bool) { </s> remove const testFltsFileName = "1.txt"
func testStartFilterListener(t *testing.T, fltContent *[]byte) (l net.Listener) {
</s> add // serveFiltersLocally is a helper that concurrently listens on a free port to
// respond with fltContent. It also gracefully closes the listener when the
// test under t finishes.
func serveFiltersLocally(t *testing.T, fltContent []byte) (ipp netip.AddrPort) { </s> remove // Update properties for a filter specified by its URL
// Return status* flags.
func (d *DNSFilter) filterSetProperties(url string, newf FilterYAML, whitelist bool) int {
r := 0
</s> add // filterSetProperties searches for the particular filter list by url and sets
// the values of newList to it, updating afterwards if needed. It returns true
// if the update was performed and the filtering engine restart is required.
func (d *DNSFilter) filterSetProperties(
listURL string,
newList FilterYAML,
isAllowlist bool,
) (shouldRestart bool, err error) { </s> remove i := slices.IndexFunc(filters, func(filt FilterYAML) bool {
return filt.URL == url
})
</s> add i := slices.IndexFunc(filters, func(filt FilterYAML) bool { return filt.URL == listURL }) | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/home/clients.go |
keep keep keep keep replace keep keep keep keep keep | <mask> if err != nil {
<mask> return fmt.Errorf("stopping forwarding dns server: %w", err)
<mask> }
<mask>
<mask> err = Context.clients.Close()
<mask> if err != nil {
<mask> return fmt.Errorf("closing clients container: %w", err)
<mask> }
<mask>
<mask> closeDNSServer()
</s> Pull request: 4916 Editing filter
Merge in DNS/adguard-home from 4916-fix-filter-edit to master
Closes #4916.
Squashed commit of the following:
commit c31be58abf73ed6047edc04ee606bceeb698f1bb
Merge: c9f3e337 67d89660
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 19:58:16 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit c9f3e337be8f005cc667d1cfd505f8cbca97cf20
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 14:49:53 2022 +0300
filtering: imp docs
commit ef8228fd51772fb4c1876864a1d8e41caec45a70
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 21 12:40:00 2022 +0300
filtering: imp code
commit 57fdbfca882537e50685b514f89bd9cf8a4cf5da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 20 11:54:39 2022 +0300
filtering: imp docs
commit 670ac9aa009f4d6b021c37992182492f943a5005
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:03:26 2022 +0300
home: unexport close of clients container
commit f5b29166ede4c89966740bee8d09b443fde9e475
Merge: 2e57624e 2de42284
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:02:33 2022 +0300
Merge branch 'master' into 4916-fix-filter-edit
commit 2e57624e00ff702ef469ec0aa129eae9b627e41f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Wed Oct 19 21:01:19 2022 +0300
filtering: imp code, tests
commit be56df7cef9b0548de3ac6bb9ced7705d7f31783
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Oct 18 15:31:30 2022 +0300
filtering: fix url edit </s> remove err = fmt.Errorf("invalid url: %s", err)
</s> add </s> remove log.Error("Can't initialize filtering subsystem: %s", err)
</s> add log.Error("filtering: can't initialize filtering subsystem: %s", err)
</s> remove filt.checksum = 0
filt.RulesCount = 0
}
if filt.Enabled != newf.Enabled {
r |= statusEnabledChanged
filt.Enabled = newf.Enabled
if filt.Enabled {
if (r & statusURLChanged) == 0 {
err := d.load(filt)
if err != nil {
// TODO(e.burkov): It seems the error is only returned when
// the file exists and couldn't be open. Investigate and
// improve.
log.Error("loading filter %d: %s", filt.ID, err)
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0
r |= statusUpdateRequired
}
}
} else {
filt.unload()
</s> add filt.unload()
}
if filt.Enabled != newList.Enabled {
filt.Enabled = newList.Enabled
shouldRestart = true
}
if filt.Enabled {
if shouldRestart {
// Download the filter contents.
shouldRestart, err = d.update(filt) </s> remove return
}
if (status & statusURLExists) != 0 {
aghhttp.Error(r, w, http.StatusBadRequest, "URL already exists")
</s> add restart, err := d.filterSetProperties(fj.URL, filt, fj.Whitelist)
if err != nil {
aghhttp.Error(r, w, http.StatusBadRequest, err.Error()) </s> remove filt.ID = assignUniqueFilterID()
</s> add </s> remove go func() {
_ = http.Serve(l, h)
}()
</s> add go func() { _ = http.Serve(l, h) }() | https://github.com/AdguardTeam/AdGuardHome/commit/a149d816d95edafe407f31f315bb509c10508971 | internal/home/dns.go |
keep keep keep add keep keep keep keep | <mask> import (
<mask> "encoding/json"
<mask> "fmt"
<mask> "log"
<mask> "net/http"
<mask> "os"
<mask> "path"
<mask> "runtime"
</s> code review -- move constants into named constants </s> add "os"
"path"
"runtime" </s> remove const (
queryLogRotationPeriod = time.Hour * 24 // rotate the log every 24 hours
queryLogFileName = "querylog.json" // .gz added during compression
)
</s> add </s> remove logBufferCap = 5000 // maximum capacity of logBuffer before it's flushed to disk
queryLogCacheSize = 1000 // maximum API response for /querylog
queryLogCacheTime = time.Minute
</s> add logBufferCap = 5000 // maximum capacity of logBuffer before it's flushed to disk
queryLogTimeLimit = time.Hour * 24 // how far in the past we care about querylogs
queryLogRotationPeriod = time.Hour * 24 // rotate the log every 24 hours
queryLogFileName = "querylog.json" // .gz added during compression
queryLogCacheSize = 1000 // maximum API response for /querylog
queryLogCacheTime = time.Minute // if requested more often than this, give out cached response
queryLogTopSize = 500 // Keep in memory only top N values
queryLogAPIPort = "8618" // 8618 is sha512sum of "querylog" then each byte summed </s> remove */
</s> add } </s> remove /*
</s> add if false { // not commented out to make code checked during compilation </s> remove // func (d *dayTop) loadedReadLock() { tracelock(); d.loadedLock.RLock() }
// func (d *dayTop) loadedReadUnlock() { tracelock(); d.loadedLock.RUnlock() }
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/a15f21ca1cd0acabf77a4e9750dd77b2b870a6f4 | coredns_plugin/querylog.go |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> const (
<mask> logBufferCap = 5000 // maximum capacity of logBuffer before it's flushed to disk
<mask> queryLogCacheSize = 1000 // maximum API response for /querylog
<mask> queryLogCacheTime = time.Minute
<mask> )
<mask>
<mask> var (
<mask> logBufferLock sync.RWMutex
<mask> logBuffer []logEntry
</s> code review -- move constants into named constants </s> remove const (
queryLogRotationPeriod = time.Hour * 24 // rotate the log every 24 hours
queryLogFileName = "querylog.json" // .gz added during compression
)
</s> add </s> remove values = appendFromLogFile(values, queryLogCacheSize, time.Hour*24)
</s> add values = appendFromLogFile(values, queryLogCacheSize, queryLogTimeLimit) </s> remove top.domains = gcache.New(500).LRU().Build()
top.blocked = gcache.New(500).LRU().Build()
top.clients = gcache.New(500).LRU().Build()
</s> add top.domains = gcache.New(topLRUsize).LRU().Build()
top.blocked = gcache.New(topLRUsize).LRU().Build()
top.clients = gcache.New(topLRUsize).LRU().Build() </s> remove http.Error(w, errortext, 500)
</s> add http.Error(w, errortext, http.StatusInternalServerError) </s> remove func periodicQueryLogRotate(t time.Duration) {
for range time.Tick(t) {
</s> add func periodicQueryLogRotate() {
for range time.Tick(queryLogRotationPeriod) { </s> add "net" | https://github.com/AdguardTeam/AdGuardHome/commit/a15f21ca1cd0acabf77a4e9750dd77b2b870a6f4 | coredns_plugin/querylog.go |
keep keep keep keep replace keep keep keep keep keep | <mask> values := logBuffer
<mask> logBufferLock.RUnlock()
<mask>
<mask> if len(values) < queryLogCacheSize {
<mask> values = appendFromLogFile(values, queryLogCacheSize, time.Hour*24)
<mask> }
<mask> queryLogLock.Lock()
<mask> queryLogCache = values
<mask> queryLogTime = now
<mask> queryLogLock.Unlock()
</s> code review -- move constants into named constants </s> remove logBufferCap = 5000 // maximum capacity of logBuffer before it's flushed to disk
queryLogCacheSize = 1000 // maximum API response for /querylog
queryLogCacheTime = time.Minute
</s> add logBufferCap = 5000 // maximum capacity of logBuffer before it's flushed to disk
queryLogTimeLimit = time.Hour * 24 // how far in the past we care about querylogs
queryLogRotationPeriod = time.Hour * 24 // rotate the log every 24 hours
queryLogFileName = "querylog.json" // .gz added during compression
queryLogCacheSize = 1000 // maximum API response for /querylog
queryLogCacheTime = time.Minute // if requested more often than this, give out cached response
queryLogTopSize = 500 // Keep in memory only top N values
queryLogAPIPort = "8618" // 8618 is sha512sum of "querylog" then each byte summed </s> remove top.domains = gcache.New(500).LRU().Build()
top.blocked = gcache.New(500).LRU().Build()
top.clients = gcache.New(500).LRU().Build()
</s> add top.domains = gcache.New(topLRUsize).LRU().Build()
top.blocked = gcache.New(topLRUsize).LRU().Build()
top.clients = gcache.New(topLRUsize).LRU().Build() </s> remove err := genericLoader(onEntry, needMore, time.Hour*24)
</s> add err := genericLoader(onEntry, needMore, queryLogTimeLimit) </s> remove http.Error(w, errortext, 500)
</s> add http.Error(w, errortext, http.StatusInternalServerError) </s> remove const (
queryLogRotationPeriod = time.Hour * 24 // rotate the log every 24 hours
queryLogFileName = "querylog.json" // .gz added during compression
)
</s> add </s> remove /*
</s> add if false { // not commented out to make code checked during compilation | https://github.com/AdguardTeam/AdGuardHome/commit/a15f21ca1cd0acabf77a4e9750dd77b2b870a6f4 | coredns_plugin/querylog.go |
keep replace keep keep keep keep replace keep keep keep keep | <mask> log.Println(errortext)
<mask> http.Error(w, errortext, 500)
<mask> }
<mask> }
<mask>
<mask> func startQueryLogServer() {
<mask> listenAddr := "127.0.0.1:8618" // 8618 is sha512sum of "querylog" then each byte summed
<mask>
<mask> go periodicQueryLogRotate(queryLogRotationPeriod)
<mask> go periodicHourlyTopRotate()
<mask>
</s> code review -- move constants into named constants </s> remove go periodicQueryLogRotate(queryLogRotationPeriod)
</s> add go periodicQueryLogRotate() </s> remove logBufferCap = 5000 // maximum capacity of logBuffer before it's flushed to disk
queryLogCacheSize = 1000 // maximum API response for /querylog
queryLogCacheTime = time.Minute
</s> add logBufferCap = 5000 // maximum capacity of logBuffer before it's flushed to disk
queryLogTimeLimit = time.Hour * 24 // how far in the past we care about querylogs
queryLogRotationPeriod = time.Hour * 24 // rotate the log every 24 hours
queryLogFileName = "querylog.json" // .gz added during compression
queryLogCacheSize = 1000 // maximum API response for /querylog
queryLogCacheTime = time.Minute // if requested more often than this, give out cached response
queryLogTopSize = 500 // Keep in memory only top N values
queryLogAPIPort = "8618" // 8618 is sha512sum of "querylog" then each byte summed </s> remove // func (d *dayTop) loadedReadLock() { tracelock(); d.loadedLock.RLock() }
// func (d *dayTop) loadedReadUnlock() { tracelock(); d.loadedLock.RUnlock() }
</s> add </s> remove /*
</s> add if false { // not commented out to make code checked during compilation </s> remove func periodicQueryLogRotate(t time.Duration) {
for range time.Tick(t) {
</s> add func periodicQueryLogRotate() {
for range time.Tick(queryLogRotationPeriod) { | https://github.com/AdguardTeam/AdGuardHome/commit/a15f21ca1cd0acabf77a4e9750dd77b2b870a6f4 | coredns_plugin/querylog.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> func startQueryLogServer() {
<mask> listenAddr := "127.0.0.1:8618" // 8618 is sha512sum of "querylog" then each byte summed
<mask>
<mask> go periodicQueryLogRotate(queryLogRotationPeriod)
<mask> go periodicHourlyTopRotate()
<mask>
<mask> http.HandleFunc("/querylog", handleQueryLog)
<mask> http.HandleFunc("/stats_top", handleStatsTop)
<mask> if err := http.ListenAndServe(listenAddr, nil); err != nil {
</s> code review -- move constants into named constants </s> remove listenAddr := "127.0.0.1:8618" // 8618 is sha512sum of "querylog" then each byte summed
</s> add listenAddr := net.JoinHostPort("127.0.0.1", queryLogAPIPort) </s> remove http.Error(w, errortext, 500)
</s> add http.Error(w, errortext, http.StatusInternalServerError) </s> remove func periodicQueryLogRotate(t time.Duration) {
for range time.Tick(t) {
</s> add func periodicQueryLogRotate() {
for range time.Tick(queryLogRotationPeriod) { </s> remove err := genericLoader(onEntry, needMore, time.Hour*24)
</s> add err := genericLoader(onEntry, needMore, queryLogTimeLimit) </s> remove logBufferCap = 5000 // maximum capacity of logBuffer before it's flushed to disk
queryLogCacheSize = 1000 // maximum API response for /querylog
queryLogCacheTime = time.Minute
</s> add logBufferCap = 5000 // maximum capacity of logBuffer before it's flushed to disk
queryLogTimeLimit = time.Hour * 24 // how far in the past we care about querylogs
queryLogRotationPeriod = time.Hour * 24 // rotate the log every 24 hours
queryLogFileName = "querylog.json" // .gz added during compression
queryLogCacheSize = 1000 // maximum API response for /querylog
queryLogCacheTime = time.Minute // if requested more often than this, give out cached response
queryLogTopSize = 500 // Keep in memory only top N values
queryLogAPIPort = "8618" // 8618 is sha512sum of "querylog" then each byte summed </s> remove /*
</s> add if false { // not commented out to make code checked during compilation | https://github.com/AdguardTeam/AdGuardHome/commit/a15f21ca1cd0acabf77a4e9750dd77b2b870a6f4 | coredns_plugin/querylog.go |
keep keep keep keep replace replace replace replace replace keep keep keep keep keep | <mask>
<mask> "github.com/go-test/deep"
<mask> )
<mask>
<mask> const (
<mask> queryLogRotationPeriod = time.Hour * 24 // rotate the log every 24 hours
<mask> queryLogFileName = "querylog.json" // .gz added during compression
<mask> )
<mask>
<mask> var (
<mask> fileWriteLock sync.Mutex
<mask> )
<mask>
<mask> func flushToFile(buffer []logEntry) error {
</s> code review -- move constants into named constants </s> remove logBufferCap = 5000 // maximum capacity of logBuffer before it's flushed to disk
queryLogCacheSize = 1000 // maximum API response for /querylog
queryLogCacheTime = time.Minute
</s> add logBufferCap = 5000 // maximum capacity of logBuffer before it's flushed to disk
queryLogTimeLimit = time.Hour * 24 // how far in the past we care about querylogs
queryLogRotationPeriod = time.Hour * 24 // rotate the log every 24 hours
queryLogFileName = "querylog.json" // .gz added during compression
queryLogCacheSize = 1000 // maximum API response for /querylog
queryLogCacheTime = time.Minute // if requested more often than this, give out cached response
queryLogTopSize = 500 // Keep in memory only top N values
queryLogAPIPort = "8618" // 8618 is sha512sum of "querylog" then each byte summed </s> remove top.domains = gcache.New(500).LRU().Build()
top.blocked = gcache.New(500).LRU().Build()
top.clients = gcache.New(500).LRU().Build()
</s> add top.domains = gcache.New(topLRUsize).LRU().Build()
top.blocked = gcache.New(topLRUsize).LRU().Build()
top.clients = gcache.New(topLRUsize).LRU().Build() </s> remove func periodicQueryLogRotate(t time.Duration) {
for range time.Tick(t) {
</s> add func periodicQueryLogRotate() {
for range time.Tick(queryLogRotationPeriod) { </s> remove /*
</s> add if false { // not commented out to make code checked during compilation </s> add "net" </s> remove http.Error(w, errortext, 500)
</s> add http.Error(w, errortext, http.StatusInternalServerError) | https://github.com/AdguardTeam/AdGuardHome/commit/a15f21ca1cd0acabf77a4e9750dd77b2b870a6f4 | coredns_plugin/querylog_file.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask>
<mask> return nil
<mask> }
<mask>
<mask> func periodicQueryLogRotate(t time.Duration) {
<mask> for range time.Tick(t) {
<mask> err := rotateQueryLog()
<mask> if err != nil {
<mask> log.Printf("Failed to rotate querylog: %s", err)
<mask> // do nothing, continue rotating
<mask> }
</s> code review -- move constants into named constants </s> remove err := genericLoader(onEntry, needMore, time.Hour*24)
</s> add err := genericLoader(onEntry, needMore, queryLogTimeLimit) </s> remove http.Error(w, errortext, 500)
</s> add http.Error(w, errortext, http.StatusInternalServerError) </s> remove go periodicQueryLogRotate(queryLogRotationPeriod)
</s> add go periodicQueryLogRotate() </s> remove /*
</s> add if false { // not commented out to make code checked during compilation </s> remove // func (d *dayTop) loadedReadLock() { tracelock(); d.loadedLock.RLock() }
// func (d *dayTop) loadedReadUnlock() { tracelock(); d.loadedLock.RUnlock() }
</s> add </s> remove top.domains = gcache.New(500).LRU().Build()
top.blocked = gcache.New(500).LRU().Build()
top.clients = gcache.New(500).LRU().Build()
</s> add top.domains = gcache.New(topLRUsize).LRU().Build()
top.blocked = gcache.New(topLRUsize).LRU().Build()
top.clients = gcache.New(topLRUsize).LRU().Build() | https://github.com/AdguardTeam/AdGuardHome/commit/a15f21ca1cd0acabf77a4e9750dd77b2b870a6f4 | coredns_plugin/querylog_file.go |
keep keep keep add keep keep keep keep keep keep | <mask> "bytes"
<mask> "fmt"
<mask> "log"
<mask> "net/http"
<mask> "sort"
<mask> "strconv"
<mask> "strings"
<mask> "sync"
<mask> "time"
<mask>
</s> code review -- move constants into named constants </s> add "net" </s> remove */
</s> add } </s> remove /*
</s> add if false { // not commented out to make code checked during compilation </s> remove // func (d *dayTop) loadedReadLock() { tracelock(); d.loadedLock.RLock() }
// func (d *dayTop) loadedReadUnlock() { tracelock(); d.loadedLock.RUnlock() }
</s> add </s> remove err := genericLoader(onEntry, needMore, time.Hour*24)
</s> add err := genericLoader(onEntry, needMore, queryLogTimeLimit) </s> remove top.domains = gcache.New(500).LRU().Build()
top.blocked = gcache.New(500).LRU().Build()
top.clients = gcache.New(500).LRU().Build()
</s> add top.domains = gcache.New(topLRUsize).LRU().Build()
top.blocked = gcache.New(topLRUsize).LRU().Build()
top.clients = gcache.New(topLRUsize).LRU().Build() | https://github.com/AdguardTeam/AdGuardHome/commit/a15f21ca1cd0acabf77a4e9750dd77b2b870a6f4 | coredns_plugin/querylog_top.go |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> mutex sync.RWMutex
<mask> }
<mask>
<mask> func (top *hourTop) init() {
<mask> top.domains = gcache.New(500).LRU().Build()
<mask> top.blocked = gcache.New(500).LRU().Build()
<mask> top.clients = gcache.New(500).LRU().Build()
<mask> }
<mask>
<mask> type dayTop struct {
<mask> hours []*hourTop
<mask> hoursLock sync.RWMutex // writelock this lock ONLY WHEN rotating or intializing hours!
</s> code review -- move constants into named constants </s> remove // func (d *dayTop) loadedReadLock() { tracelock(); d.loadedLock.RLock() }
// func (d *dayTop) loadedReadUnlock() { tracelock(); d.loadedLock.RUnlock() }
</s> add </s> remove logBufferCap = 5000 // maximum capacity of logBuffer before it's flushed to disk
queryLogCacheSize = 1000 // maximum API response for /querylog
queryLogCacheTime = time.Minute
</s> add logBufferCap = 5000 // maximum capacity of logBuffer before it's flushed to disk
queryLogTimeLimit = time.Hour * 24 // how far in the past we care about querylogs
queryLogRotationPeriod = time.Hour * 24 // rotate the log every 24 hours
queryLogFileName = "querylog.json" // .gz added during compression
queryLogCacheSize = 1000 // maximum API response for /querylog
queryLogCacheTime = time.Minute // if requested more often than this, give out cached response
queryLogTopSize = 500 // Keep in memory only top N values
queryLogAPIPort = "8618" // 8618 is sha512sum of "querylog" then each byte summed </s> remove func periodicQueryLogRotate(t time.Duration) {
for range time.Tick(t) {
</s> add func periodicQueryLogRotate() {
for range time.Tick(queryLogRotationPeriod) { </s> remove const (
queryLogRotationPeriod = time.Hour * 24 // rotate the log every 24 hours
queryLogFileName = "querylog.json" // .gz added during compression
)
</s> add </s> remove /*
</s> add if false { // not commented out to make code checked during compilation </s> remove values = appendFromLogFile(values, queryLogCacheSize, time.Hour*24)
</s> add values = appendFromLogFile(values, queryLogCacheSize, queryLogTimeLimit) | https://github.com/AdguardTeam/AdGuardHome/commit/a15f21ca1cd0acabf77a4e9750dd77b2b870a6f4 | coredns_plugin/querylog_top.go |
keep keep keep keep replace keep keep keep keep keep | <mask> return nil
<mask> }
<mask>
<mask> needMore := func() bool { return true }
<mask> err := genericLoader(onEntry, needMore, time.Hour*24)
<mask> if err != nil {
<mask> log.Printf("Failed to load entries from querylog: %s", err)
<mask> return err
<mask> }
<mask>
</s> code review -- move constants into named constants </s> remove func periodicQueryLogRotate(t time.Duration) {
for range time.Tick(t) {
</s> add func periodicQueryLogRotate() {
for range time.Tick(queryLogRotationPeriod) { </s> remove http.Error(w, errortext, 500)
</s> add http.Error(w, errortext, http.StatusInternalServerError) </s> remove go periodicQueryLogRotate(queryLogRotationPeriod)
</s> add go periodicQueryLogRotate() </s> remove values = appendFromLogFile(values, queryLogCacheSize, time.Hour*24)
</s> add values = appendFromLogFile(values, queryLogCacheSize, queryLogTimeLimit) </s> remove /*
</s> add if false { // not commented out to make code checked during compilation </s> remove listenAddr := "127.0.0.1:8618" // 8618 is sha512sum of "querylog" then each byte summed
</s> add listenAddr := net.JoinHostPort("127.0.0.1", queryLogAPIPort) | https://github.com/AdguardTeam/AdGuardHome/commit/a15f21ca1cd0acabf77a4e9750dd77b2b870a6f4 | coredns_plugin/querylog_top.go |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> func (d *dayTop) hoursReadUnlock() { tracelock(); d.hoursLock.RUnlock() }
<mask> func (d *dayTop) loadedWriteLock() { tracelock(); d.loadedLock.Lock() }
<mask> func (d *dayTop) loadedWriteUnlock() { tracelock(); d.loadedLock.Unlock() }
<mask>
<mask> // func (d *dayTop) loadedReadLock() { tracelock(); d.loadedLock.RLock() }
<mask> // func (d *dayTop) loadedReadUnlock() { tracelock(); d.loadedLock.RUnlock() }
<mask>
<mask> func (h *hourTop) Lock() { tracelock(); h.mutex.Lock() }
<mask> func (h *hourTop) RLock() { tracelock(); h.mutex.RLock() }
<mask> func (h *hourTop) RUnlock() { tracelock(); h.mutex.RUnlock() }
<mask> func (h *hourTop) Unlock() { tracelock(); h.mutex.Unlock() }
<mask>
</s> code review -- move constants into named constants </s> remove /*
</s> add if false { // not commented out to make code checked during compilation </s> remove func periodicQueryLogRotate(t time.Duration) {
for range time.Tick(t) {
</s> add func periodicQueryLogRotate() {
for range time.Tick(queryLogRotationPeriod) { </s> remove top.domains = gcache.New(500).LRU().Build()
top.blocked = gcache.New(500).LRU().Build()
top.clients = gcache.New(500).LRU().Build()
</s> add top.domains = gcache.New(topLRUsize).LRU().Build()
top.blocked = gcache.New(topLRUsize).LRU().Build()
top.clients = gcache.New(topLRUsize).LRU().Build() </s> remove listenAddr := "127.0.0.1:8618" // 8618 is sha512sum of "querylog" then each byte summed
</s> add listenAddr := net.JoinHostPort("127.0.0.1", queryLogAPIPort) </s> remove http.Error(w, errortext, 500)
</s> add http.Error(w, errortext, http.StatusInternalServerError) </s> remove err := genericLoader(onEntry, needMore, time.Hour*24)
</s> add err := genericLoader(onEntry, needMore, queryLogTimeLimit) | https://github.com/AdguardTeam/AdGuardHome/commit/a15f21ca1cd0acabf77a4e9750dd77b2b870a6f4 | coredns_plugin/querylog_top.go |
keep keep keep keep replace keep keep keep keep keep | <mask> func (h *hourTop) RUnlock() { tracelock(); h.mutex.RUnlock() }
<mask> func (h *hourTop) Unlock() { tracelock(); h.mutex.Unlock() }
<mask>
<mask> func tracelock() {
<mask> /*
<mask> pc := make([]uintptr, 10) // at least 1 entry needed
<mask> runtime.Callers(2, pc)
<mask> f := path.Base(runtime.FuncForPC(pc[1]).Name())
<mask> lockf := path.Base(runtime.FuncForPC(pc[0]).Name())
<mask> fmt.Fprintf(os.Stderr, "%s(): %s\n", f, lockf)
</s> code review -- move constants into named constants </s> remove */
</s> add } </s> remove // func (d *dayTop) loadedReadLock() { tracelock(); d.loadedLock.RLock() }
// func (d *dayTop) loadedReadUnlock() { tracelock(); d.loadedLock.RUnlock() }
</s> add </s> remove func periodicQueryLogRotate(t time.Duration) {
for range time.Tick(t) {
</s> add func periodicQueryLogRotate() {
for range time.Tick(queryLogRotationPeriod) { </s> remove listenAddr := "127.0.0.1:8618" // 8618 is sha512sum of "querylog" then each byte summed
</s> add listenAddr := net.JoinHostPort("127.0.0.1", queryLogAPIPort) </s> remove top.domains = gcache.New(500).LRU().Build()
top.blocked = gcache.New(500).LRU().Build()
top.clients = gcache.New(500).LRU().Build()
</s> add top.domains = gcache.New(topLRUsize).LRU().Build()
top.blocked = gcache.New(topLRUsize).LRU().Build()
top.clients = gcache.New(topLRUsize).LRU().Build() </s> remove http.Error(w, errortext, 500)
</s> add http.Error(w, errortext, http.StatusInternalServerError) | https://github.com/AdguardTeam/AdGuardHome/commit/a15f21ca1cd0acabf77a4e9750dd77b2b870a6f4 | coredns_plugin/querylog_top.go |
keep keep keep keep replace keep | <mask> runtime.Callers(2, pc)
<mask> f := path.Base(runtime.FuncForPC(pc[1]).Name())
<mask> lockf := path.Base(runtime.FuncForPC(pc[0]).Name())
<mask> fmt.Fprintf(os.Stderr, "%s(): %s\n", f, lockf)
<mask> */
<mask> }
</s> code review -- move constants into named constants </s> remove /*
</s> add if false { // not commented out to make code checked during compilation </s> remove err := genericLoader(onEntry, needMore, time.Hour*24)
</s> add err := genericLoader(onEntry, needMore, queryLogTimeLimit) </s> remove listenAddr := "127.0.0.1:8618" // 8618 is sha512sum of "querylog" then each byte summed
</s> add listenAddr := net.JoinHostPort("127.0.0.1", queryLogAPIPort) </s> remove http.Error(w, errortext, 500)
</s> add http.Error(w, errortext, http.StatusInternalServerError) </s> remove func periodicQueryLogRotate(t time.Duration) {
for range time.Tick(t) {
</s> add func periodicQueryLogRotate() {
for range time.Tick(queryLogRotationPeriod) { </s> remove values = appendFromLogFile(values, queryLogCacheSize, time.Hour*24)
</s> add values = appendFromLogFile(values, queryLogCacheSize, queryLogTimeLimit) | https://github.com/AdguardTeam/AdGuardHome/commit/a15f21ca1cd0acabf77a4e9750dd77b2b870a6f4 | coredns_plugin/querylog_top.go |
keep keep add keep keep keep keep keep | <mask> FilteringConfig: config.DNS.FilteringConfig,
<mask> Filters: filters,
<mask> }
<mask>
<mask> if config.TLS.Enabled {
<mask> newconfig.TLSConfig = config.TLS.TLSConfig
<mask> if config.TLS.PortDNSOverTLS != 0 {
<mask> newconfig.TLSListenAddr = &net.TCPAddr{IP: net.ParseIP(config.DNS.BindHost), Port: config.TLS.PortDNSOverTLS}
</s> + parental, safesearch: use our own DNS resolver instead of system default </s> add if len(c.ResolverAddress) != 0 {
resolverAddr = c.ResolverAddress
d.transport.DialContext = customDialContext
} </s> remove ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
</s> add ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address </s> add "github.com/AdguardTeam/dnsproxy/upstream" </s> add var resolverAddr string // DNS server address
</s> add "context" | https://github.com/AdguardTeam/AdGuardHome/commit/a1b18776678ee894cd0b558cf8683845056a2dfa | dns.go |
keep keep add keep keep keep keep keep keep | <mask> import (
<mask> "bufio"
<mask> "bytes"
<mask> "crypto/sha256"
<mask> "encoding/json"
<mask> "errors"
<mask> "fmt"
<mask> "io/ioutil"
<mask> "net"
</s> + parental, safesearch: use our own DNS resolver instead of system default </s> add if len(c.ResolverAddress) != 0 {
resolverAddr = c.ResolverAddress
d.transport.DialContext = customDialContext
} </s> add var resolverAddr string // DNS server address
</s> remove ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
</s> add ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address </s> add "github.com/AdguardTeam/dnsproxy/upstream" </s> add newconfig.ResolverAddress = fmt.Sprintf("%s:%d", config.DNS.BindHost, config.DNS.Port) | https://github.com/AdguardTeam/AdGuardHome/commit/a1b18776678ee894cd0b558cf8683845056a2dfa | dnsfilter/dnsfilter.go |
keep add keep keep keep keep keep keep | <mask> "time"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/bluele/gcache"
<mask> "golang.org/x/net/publicsuffix"
<mask> )
<mask>
<mask> const defaultCacheSize = 64 * 1024 // in number of elements
</s> + parental, safesearch: use our own DNS resolver instead of system default </s> add if len(c.ResolverAddress) != 0 {
resolverAddr = c.ResolverAddress
d.transport.DialContext = customDialContext
} </s> add var resolverAddr string // DNS server address
</s> remove ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
</s> add ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address </s> add newconfig.ResolverAddress = fmt.Sprintf("%s:%d", config.DNS.BindHost, config.DNS.Port) </s> add "context" | https://github.com/AdguardTeam/AdGuardHome/commit/a1b18776678ee894cd0b558cf8683845056a2dfa | dnsfilter/dnsfilter.go |
keep keep keep keep replace replace replace replace keep keep keep keep keep | <mask> const enableDelayedCompilation = true // flag for debugging, must be true in production for faster performance
<mask>
<mask> // Config allows you to configure DNS filtering with New() or just change variables directly.
<mask> type Config struct {
<mask> ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
<mask> ParentalEnabled bool `yaml:"parental_enabled"`
<mask> SafeSearchEnabled bool `yaml:"safesearch_enabled"`
<mask> SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
<mask> }
<mask>
<mask> type privateConfig struct {
<mask> parentalServer string // access via methods
<mask> safeBrowsingServer string // access via methods
</s> + parental, safesearch: use our own DNS resolver instead of system default </s> add var resolverAddr string // DNS server address
</s> add "github.com/AdguardTeam/dnsproxy/upstream" </s> add newconfig.ResolverAddress = fmt.Sprintf("%s:%d", config.DNS.BindHost, config.DNS.Port) </s> add if len(c.ResolverAddress) != 0 {
resolverAddr = c.ResolverAddress
d.transport.DialContext = customDialContext
} </s> add "context" | https://github.com/AdguardTeam/AdGuardHome/commit/a1b18776678ee894cd0b558cf8683845056a2dfa | dnsfilter/dnsfilter.go |
keep keep add keep keep keep keep keep | <mask> safeSearchCache gcache.Cache
<mask> )
<mask>
<mask> // Result holds state of hostname check
<mask> type Result struct {
<mask> IsFiltered bool `json:",omitempty"` // True if the host name is filtered
<mask> Reason Reason `json:",omitempty"` // Reason for blocking / unblocking
<mask> Rule string `json:",omitempty"` // Original rule text
</s> + parental, safesearch: use our own DNS resolver instead of system default </s> remove ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
</s> add ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address </s> add "github.com/AdguardTeam/dnsproxy/upstream" </s> add newconfig.ResolverAddress = fmt.Sprintf("%s:%d", config.DNS.BindHost, config.DNS.Port) </s> add if len(c.ResolverAddress) != 0 {
resolverAddr = c.ResolverAddress
d.transport.DialContext = customDialContext
} </s> add "context" | https://github.com/AdguardTeam/AdGuardHome/commit/a1b18776678ee894cd0b558cf8683845056a2dfa | dnsfilter/dnsfilter.go |
keep keep add keep keep keep keep keep | <mask> TLSHandshakeTimeout: 10 * time.Second,
<mask> ExpectContinueTimeout: 1 * time.Second,
<mask> }
<mask> d.client = http.Client{
<mask> Transport: d.transport,
<mask> Timeout: defaultHTTPTimeout,
<mask> }
<mask> d.safeBrowsingServer = defaultSafebrowsingServer
</s> + parental, safesearch: use our own DNS resolver instead of system default </s> add "github.com/AdguardTeam/dnsproxy/upstream" </s> add newconfig.ResolverAddress = fmt.Sprintf("%s:%d", config.DNS.BindHost, config.DNS.Port) </s> remove ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
</s> add ParentalSensitivity int `yaml:"parental_sensitivity"` // must be either 3, 10, 13 or 17
ParentalEnabled bool `yaml:"parental_enabled"`
SafeSearchEnabled bool `yaml:"safesearch_enabled"`
SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
ResolverAddress string // DNS server address </s> add var resolverAddr string // DNS server address
</s> add "context" | https://github.com/AdguardTeam/AdGuardHome/commit/a1b18776678ee894cd0b558cf8683845056a2dfa | dnsfilter/dnsfilter.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> go 1.14
<mask>
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.33.9
<mask> github.com/AdguardTeam/golibs v0.4.4
<mask> github.com/AdguardTeam/urlfilter v0.14.3
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/ameshkov/dnscrypt/v2 v2.0.1
<mask> github.com/digineo/go-ipset/v2 v2.2.1
</s> Pull request: 2600 inconsistent response
Merge in DNS/adguard-home from 2600-upd-dnsproxy to master
Closes #2600.
Squashed commit of the following:
commit 4b1515395841f14d86bc85b5c516d14919b5dc25
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 18:39:19 2021 +0300
all: upd dnsproxy again, log changes
commit 8a866201f140655b0d2f58552a7ad9bcae91a173
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:53:48 2021 +0300
all: cleanup
commit ae81234c79a6dbc61cccbae9c1b9d0144bb7f506
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:49:28 2021 +0300
all: fix deps
commit 662384c366feaf553d9eba2b5e3be93774631ec5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 13:58:26 2021 +0300
all: upd dnsproxy version, fix functions' signatures </s> remove github.com/AdguardTeam/dnsproxy v0.33.9 h1:HUwywkhUV/M73E7qWcBAF+SdsNq742s82Lvox4pr/tM=
github.com/AdguardTeam/dnsproxy v0.33.9/go.mod h1:dkI9VWh43XlOzF2XogDm1EmoVl7PANOR4isQV6X9LZs=
</s> add github.com/AdguardTeam/dnsproxy v0.35.3 h1:mvXWoIZRRATJQyGTnq0O1ofbvuVMKRZMyycU/2tFiyE=
github.com/AdguardTeam/dnsproxy v0.35.3/go.mod h1:dkI9VWh43XlOzF2XogDm1EmoVl7PANOR4isQV6X9LZs= </s> remove r, err := upstream.NewResolver("127.0.0.1:5354", 3*time.Second)
</s> add r, err := upstream.NewResolver("127.0.0.1:5354", upstream.Options{Timeout: 3 * time.Second}) </s> remove config, err := proxy.ParseUpstreamsConfig(c.Upstreams, config.DNS.BootstrapDNS, dnsforward.DefaultTimeout)
</s> add config, err := proxy.ParseUpstreamsConfig(c.Upstreams,
upstream.Options{
Bootstrap: config.DNS.BootstrapDNS,
Timeout: dnsforward.DefaultTimeout,
},
) </s> add "github.com/AdguardTeam/dnsproxy/upstream" </s> remove _, err := proxy.ParseUpstreamsConfig(upstreams, []string{}, DefaultTimeout)
</s> add _, err := proxy.ParseUpstreamsConfig(upstreams,
upstream.Options{
Bootstrap: []string{},
Timeout: DefaultTimeout,
},
) </s> remove if _, err := upstream.NewResolver(boot, 0); err != nil {
</s> add if _, err := upstream.NewResolver(boot, upstream.Options{Timeout: 0}); err != nil { | https://github.com/AdguardTeam/AdGuardHome/commit/a234b63da10eaae84e2854b3874dc8bc97bd3042 | go.mod |
keep keep keep keep replace replace keep keep keep keep keep | <mask> dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU=
<mask> dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4=
<mask> dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU=
<mask> git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
<mask> github.com/AdguardTeam/dnsproxy v0.33.9 h1:HUwywkhUV/M73E7qWcBAF+SdsNq742s82Lvox4pr/tM=
<mask> github.com/AdguardTeam/dnsproxy v0.33.9/go.mod h1:dkI9VWh43XlOzF2XogDm1EmoVl7PANOR4isQV6X9LZs=
<mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.4.2 h1:7M28oTZFoFwNmp8eGPb3ImmYbxGaJLyQXeIFVHjME0o=
<mask> github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.4.4 h1:cM9UySQiYFW79zo5XRwnaIWVzfW4eNXmZktMrWbthpw=
<mask> github.com/AdguardTeam/golibs v0.4.4/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
</s> Pull request: 2600 inconsistent response
Merge in DNS/adguard-home from 2600-upd-dnsproxy to master
Closes #2600.
Squashed commit of the following:
commit 4b1515395841f14d86bc85b5c516d14919b5dc25
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 18:39:19 2021 +0300
all: upd dnsproxy again, log changes
commit 8a866201f140655b0d2f58552a7ad9bcae91a173
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:53:48 2021 +0300
all: cleanup
commit ae81234c79a6dbc61cccbae9c1b9d0144bb7f506
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:49:28 2021 +0300
all: fix deps
commit 662384c366feaf553d9eba2b5e3be93774631ec5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 13:58:26 2021 +0300
all: upd dnsproxy version, fix functions' signatures </s> remove github.com/AdguardTeam/dnsproxy v0.33.9
</s> add github.com/AdguardTeam/dnsproxy v0.35.3 </s> remove r, err := upstream.NewResolver("127.0.0.1:5354", 3*time.Second)
</s> add r, err := upstream.NewResolver("127.0.0.1:5354", upstream.Options{Timeout: 3 * time.Second}) </s> remove config, err := proxy.ParseUpstreamsConfig(c.Upstreams, config.DNS.BootstrapDNS, dnsforward.DefaultTimeout)
</s> add config, err := proxy.ParseUpstreamsConfig(c.Upstreams,
upstream.Options{
Bootstrap: config.DNS.BootstrapDNS,
Timeout: dnsforward.DefaultTimeout,
},
) </s> add "github.com/AdguardTeam/dnsproxy/upstream" </s> remove _, err := proxy.ParseUpstreamsConfig(upstreams, []string{}, DefaultTimeout)
</s> add _, err := proxy.ParseUpstreamsConfig(upstreams,
upstream.Options{
Bootstrap: []string{},
Timeout: DefaultTimeout,
},
) </s> remove if _, err := upstream.NewResolver(boot, 0); err != nil {
</s> add if _, err := upstream.NewResolver(boot, upstream.Options{Timeout: 0}); err != nil { | https://github.com/AdguardTeam/AdGuardHome/commit/a234b63da10eaae84e2854b3874dc8bc97bd3042 | go.sum |
keep keep keep keep replace keep keep keep keep keep | <mask> } else {
<mask> upstreams = s.conf.UpstreamDNS
<mask> }
<mask> upstreams = filterOutComments(upstreams)
<mask> upstreamConfig, err := proxy.ParseUpstreamsConfig(upstreams, s.conf.BootstrapDNS, DefaultTimeout)
<mask> if err != nil {
<mask> return fmt.Errorf("dns: proxy.ParseUpstreamsConfig: %w", err)
<mask> }
<mask>
<mask> if len(upstreamConfig.Upstreams) == 0 {
</s> Pull request: 2600 inconsistent response
Merge in DNS/adguard-home from 2600-upd-dnsproxy to master
Closes #2600.
Squashed commit of the following:
commit 4b1515395841f14d86bc85b5c516d14919b5dc25
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 18:39:19 2021 +0300
all: upd dnsproxy again, log changes
commit 8a866201f140655b0d2f58552a7ad9bcae91a173
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:53:48 2021 +0300
all: cleanup
commit ae81234c79a6dbc61cccbae9c1b9d0144bb7f506
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:49:28 2021 +0300
all: fix deps
commit 662384c366feaf553d9eba2b5e3be93774631ec5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 13:58:26 2021 +0300
all: upd dnsproxy version, fix functions' signatures </s> remove uc, err := proxy.ParseUpstreamsConfig(defaultDNS, s.conf.BootstrapDNS, DefaultTimeout)
</s> add uc, err := proxy.ParseUpstreamsConfig(defaultDNS,
upstream.Options{
Bootstrap: s.conf.BootstrapDNS,
Timeout: DefaultTimeout,
},
) </s> remove _, err := proxy.ParseUpstreamsConfig(upstreams, []string{}, DefaultTimeout)
</s> add _, err := proxy.ParseUpstreamsConfig(upstreams,
upstream.Options{
Bootstrap: []string{},
Timeout: DefaultTimeout,
},
) </s> remove if _, err := upstream.NewResolver(boot, 0); err != nil {
</s> add if _, err := upstream.NewResolver(boot, upstream.Options{Timeout: 0}); err != nil { </s> remove config, err := proxy.ParseUpstreamsConfig(c.Upstreams, config.DNS.BootstrapDNS, dnsforward.DefaultTimeout)
</s> add config, err := proxy.ParseUpstreamsConfig(c.Upstreams,
upstream.Options{
Bootstrap: config.DNS.BootstrapDNS,
Timeout: dnsforward.DefaultTimeout,
},
) </s> remove r, err := upstream.NewResolver("127.0.0.1:5354", 3*time.Second)
</s> add r, err := upstream.NewResolver("127.0.0.1:5354", upstream.Options{Timeout: 3 * time.Second}) </s> add "github.com/AdguardTeam/dnsproxy/upstream" | https://github.com/AdguardTeam/AdGuardHome/commit/a234b63da10eaae84e2854b3874dc8bc97bd3042 | internal/dnsforward/config.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> if len(upstreamConfig.Upstreams) == 0 {
<mask> log.Info("warning: no default upstream servers specified, using %v", defaultDNS)
<mask> uc, err := proxy.ParseUpstreamsConfig(defaultDNS, s.conf.BootstrapDNS, DefaultTimeout)
<mask> if err != nil {
<mask> return fmt.Errorf("dns: failed to parse default upstreams: %v", err)
<mask> }
<mask> upstreamConfig.Upstreams = uc.Upstreams
<mask> }
</s> Pull request: 2600 inconsistent response
Merge in DNS/adguard-home from 2600-upd-dnsproxy to master
Closes #2600.
Squashed commit of the following:
commit 4b1515395841f14d86bc85b5c516d14919b5dc25
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 18:39:19 2021 +0300
all: upd dnsproxy again, log changes
commit 8a866201f140655b0d2f58552a7ad9bcae91a173
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:53:48 2021 +0300
all: cleanup
commit ae81234c79a6dbc61cccbae9c1b9d0144bb7f506
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:49:28 2021 +0300
all: fix deps
commit 662384c366feaf553d9eba2b5e3be93774631ec5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 13:58:26 2021 +0300
all: upd dnsproxy version, fix functions' signatures </s> remove upstreamConfig, err := proxy.ParseUpstreamsConfig(upstreams, s.conf.BootstrapDNS, DefaultTimeout)
</s> add upstreamConfig, err := proxy.ParseUpstreamsConfig(upstreams,
upstream.Options{
Bootstrap: s.conf.BootstrapDNS,
Timeout: DefaultTimeout,
},
) </s> remove _, err := proxy.ParseUpstreamsConfig(upstreams, []string{}, DefaultTimeout)
</s> add _, err := proxy.ParseUpstreamsConfig(upstreams,
upstream.Options{
Bootstrap: []string{},
Timeout: DefaultTimeout,
},
) </s> remove if _, err := upstream.NewResolver(boot, 0); err != nil {
</s> add if _, err := upstream.NewResolver(boot, upstream.Options{Timeout: 0}); err != nil { </s> remove config, err := proxy.ParseUpstreamsConfig(c.Upstreams, config.DNS.BootstrapDNS, dnsforward.DefaultTimeout)
</s> add config, err := proxy.ParseUpstreamsConfig(c.Upstreams,
upstream.Options{
Bootstrap: config.DNS.BootstrapDNS,
Timeout: dnsforward.DefaultTimeout,
},
) </s> remove r, err := upstream.NewResolver("127.0.0.1:5354", 3*time.Second)
</s> add r, err := upstream.NewResolver("127.0.0.1:5354", upstream.Options{Timeout: 3 * time.Second}) </s> add "github.com/AdguardTeam/dnsproxy/upstream" | https://github.com/AdguardTeam/AdGuardHome/commit/a234b63da10eaae84e2854b3874dc8bc97bd3042 | internal/dnsforward/config.go |
keep keep keep keep replace keep keep keep keep keep | <mask> if boot == "" {
<mask> return boot, fmt.Errorf("invalid bootstrap server address: empty")
<mask> }
<mask>
<mask> if _, err := upstream.NewResolver(boot, 0); err != nil {
<mask> return boot, fmt.Errorf("invalid bootstrap server address: %w", err)
<mask> }
<mask> }
<mask>
<mask> return "", nil
</s> Pull request: 2600 inconsistent response
Merge in DNS/adguard-home from 2600-upd-dnsproxy to master
Closes #2600.
Squashed commit of the following:
commit 4b1515395841f14d86bc85b5c516d14919b5dc25
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 18:39:19 2021 +0300
all: upd dnsproxy again, log changes
commit 8a866201f140655b0d2f58552a7ad9bcae91a173
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:53:48 2021 +0300
all: cleanup
commit ae81234c79a6dbc61cccbae9c1b9d0144bb7f506
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:49:28 2021 +0300
all: fix deps
commit 662384c366feaf553d9eba2b5e3be93774631ec5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 13:58:26 2021 +0300
all: upd dnsproxy version, fix functions' signatures </s> remove _, err := proxy.ParseUpstreamsConfig(upstreams, []string{}, DefaultTimeout)
</s> add _, err := proxy.ParseUpstreamsConfig(upstreams,
upstream.Options{
Bootstrap: []string{},
Timeout: DefaultTimeout,
},
) </s> remove upstreamConfig, err := proxy.ParseUpstreamsConfig(upstreams, s.conf.BootstrapDNS, DefaultTimeout)
</s> add upstreamConfig, err := proxy.ParseUpstreamsConfig(upstreams,
upstream.Options{
Bootstrap: s.conf.BootstrapDNS,
Timeout: DefaultTimeout,
},
) </s> remove config, err := proxy.ParseUpstreamsConfig(c.Upstreams, config.DNS.BootstrapDNS, dnsforward.DefaultTimeout)
</s> add config, err := proxy.ParseUpstreamsConfig(c.Upstreams,
upstream.Options{
Bootstrap: config.DNS.BootstrapDNS,
Timeout: dnsforward.DefaultTimeout,
},
) </s> remove uc, err := proxy.ParseUpstreamsConfig(defaultDNS, s.conf.BootstrapDNS, DefaultTimeout)
</s> add uc, err := proxy.ParseUpstreamsConfig(defaultDNS,
upstream.Options{
Bootstrap: s.conf.BootstrapDNS,
Timeout: DefaultTimeout,
},
) </s> remove r, err := upstream.NewResolver("127.0.0.1:5354", 3*time.Second)
</s> add r, err := upstream.NewResolver("127.0.0.1:5354", upstream.Options{Timeout: 3 * time.Second}) </s> add "github.com/AdguardTeam/dnsproxy/upstream" | https://github.com/AdguardTeam/AdGuardHome/commit/a234b63da10eaae84e2854b3874dc8bc97bd3042 | internal/dnsforward/http.go |
keep keep keep keep replace keep keep keep keep keep | <mask> if len(upstreams) == 0 {
<mask> return nil
<mask> }
<mask>
<mask> _, err := proxy.ParseUpstreamsConfig(upstreams, []string{}, DefaultTimeout)
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> var defaultUpstreamFound bool
</s> Pull request: 2600 inconsistent response
Merge in DNS/adguard-home from 2600-upd-dnsproxy to master
Closes #2600.
Squashed commit of the following:
commit 4b1515395841f14d86bc85b5c516d14919b5dc25
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 18:39:19 2021 +0300
all: upd dnsproxy again, log changes
commit 8a866201f140655b0d2f58552a7ad9bcae91a173
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:53:48 2021 +0300
all: cleanup
commit ae81234c79a6dbc61cccbae9c1b9d0144bb7f506
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:49:28 2021 +0300
all: fix deps
commit 662384c366feaf553d9eba2b5e3be93774631ec5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 13:58:26 2021 +0300
all: upd dnsproxy version, fix functions' signatures </s> remove if _, err := upstream.NewResolver(boot, 0); err != nil {
</s> add if _, err := upstream.NewResolver(boot, upstream.Options{Timeout: 0}); err != nil { </s> remove upstreamConfig, err := proxy.ParseUpstreamsConfig(upstreams, s.conf.BootstrapDNS, DefaultTimeout)
</s> add upstreamConfig, err := proxy.ParseUpstreamsConfig(upstreams,
upstream.Options{
Bootstrap: s.conf.BootstrapDNS,
Timeout: DefaultTimeout,
},
) </s> remove config, err := proxy.ParseUpstreamsConfig(c.Upstreams, config.DNS.BootstrapDNS, dnsforward.DefaultTimeout)
</s> add config, err := proxy.ParseUpstreamsConfig(c.Upstreams,
upstream.Options{
Bootstrap: config.DNS.BootstrapDNS,
Timeout: dnsforward.DefaultTimeout,
},
) </s> remove uc, err := proxy.ParseUpstreamsConfig(defaultDNS, s.conf.BootstrapDNS, DefaultTimeout)
</s> add uc, err := proxy.ParseUpstreamsConfig(defaultDNS,
upstream.Options{
Bootstrap: s.conf.BootstrapDNS,
Timeout: DefaultTimeout,
},
) </s> remove r, err := upstream.NewResolver("127.0.0.1:5354", 3*time.Second)
</s> add r, err := upstream.NewResolver("127.0.0.1:5354", upstream.Options{Timeout: 3 * time.Second}) </s> add "github.com/AdguardTeam/dnsproxy/upstream" | https://github.com/AdguardTeam/AdGuardHome/commit/a234b63da10eaae84e2854b3874dc8bc97bd3042 | internal/dnsforward/http.go |
keep keep keep add keep keep keep keep keep | <mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/util"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/golibs/utils"
<mask> )
<mask>
<mask> const clientsUpdatePeriod = 10 * time.Minute
</s> Pull request: 2600 inconsistent response
Merge in DNS/adguard-home from 2600-upd-dnsproxy to master
Closes #2600.
Squashed commit of the following:
commit 4b1515395841f14d86bc85b5c516d14919b5dc25
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 18:39:19 2021 +0300
all: upd dnsproxy again, log changes
commit 8a866201f140655b0d2f58552a7ad9bcae91a173
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:53:48 2021 +0300
all: cleanup
commit ae81234c79a6dbc61cccbae9c1b9d0144bb7f506
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:49:28 2021 +0300
all: fix deps
commit 662384c366feaf553d9eba2b5e3be93774631ec5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 13:58:26 2021 +0300
all: upd dnsproxy version, fix functions' signatures </s> remove r, err := upstream.NewResolver("127.0.0.1:5354", 3*time.Second)
</s> add r, err := upstream.NewResolver("127.0.0.1:5354", upstream.Options{Timeout: 3 * time.Second}) </s> remove upstreamConfig, err := proxy.ParseUpstreamsConfig(upstreams, s.conf.BootstrapDNS, DefaultTimeout)
</s> add upstreamConfig, err := proxy.ParseUpstreamsConfig(upstreams,
upstream.Options{
Bootstrap: s.conf.BootstrapDNS,
Timeout: DefaultTimeout,
},
) </s> remove config, err := proxy.ParseUpstreamsConfig(c.Upstreams, config.DNS.BootstrapDNS, dnsforward.DefaultTimeout)
</s> add config, err := proxy.ParseUpstreamsConfig(c.Upstreams,
upstream.Options{
Bootstrap: config.DNS.BootstrapDNS,
Timeout: dnsforward.DefaultTimeout,
},
) </s> remove uc, err := proxy.ParseUpstreamsConfig(defaultDNS, s.conf.BootstrapDNS, DefaultTimeout)
</s> add uc, err := proxy.ParseUpstreamsConfig(defaultDNS,
upstream.Options{
Bootstrap: s.conf.BootstrapDNS,
Timeout: DefaultTimeout,
},
) </s> remove _, err := proxy.ParseUpstreamsConfig(upstreams, []string{}, DefaultTimeout)
</s> add _, err := proxy.ParseUpstreamsConfig(upstreams,
upstream.Options{
Bootstrap: []string{},
Timeout: DefaultTimeout,
},
) </s> remove if _, err := upstream.NewResolver(boot, 0); err != nil {
</s> add if _, err := upstream.NewResolver(boot, upstream.Options{Timeout: 0}); err != nil { | https://github.com/AdguardTeam/AdGuardHome/commit/a234b63da10eaae84e2854b3874dc8bc97bd3042 | internal/home/clients.go |
keep keep keep keep replace keep keep keep keep keep | <mask> return nil
<mask> }
<mask>
<mask> if c.upstreamConfig == nil {
<mask> config, err := proxy.ParseUpstreamsConfig(c.Upstreams, config.DNS.BootstrapDNS, dnsforward.DefaultTimeout)
<mask> if err == nil {
<mask> c.upstreamConfig = &config
<mask> }
<mask> }
<mask>
</s> Pull request: 2600 inconsistent response
Merge in DNS/adguard-home from 2600-upd-dnsproxy to master
Closes #2600.
Squashed commit of the following:
commit 4b1515395841f14d86bc85b5c516d14919b5dc25
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 18:39:19 2021 +0300
all: upd dnsproxy again, log changes
commit 8a866201f140655b0d2f58552a7ad9bcae91a173
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:53:48 2021 +0300
all: cleanup
commit ae81234c79a6dbc61cccbae9c1b9d0144bb7f506
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:49:28 2021 +0300
all: fix deps
commit 662384c366feaf553d9eba2b5e3be93774631ec5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 13:58:26 2021 +0300
all: upd dnsproxy version, fix functions' signatures </s> remove if _, err := upstream.NewResolver(boot, 0); err != nil {
</s> add if _, err := upstream.NewResolver(boot, upstream.Options{Timeout: 0}); err != nil { </s> remove _, err := proxy.ParseUpstreamsConfig(upstreams, []string{}, DefaultTimeout)
</s> add _, err := proxy.ParseUpstreamsConfig(upstreams,
upstream.Options{
Bootstrap: []string{},
Timeout: DefaultTimeout,
},
) </s> remove upstreamConfig, err := proxy.ParseUpstreamsConfig(upstreams, s.conf.BootstrapDNS, DefaultTimeout)
</s> add upstreamConfig, err := proxy.ParseUpstreamsConfig(upstreams,
upstream.Options{
Bootstrap: s.conf.BootstrapDNS,
Timeout: DefaultTimeout,
},
) </s> remove uc, err := proxy.ParseUpstreamsConfig(defaultDNS, s.conf.BootstrapDNS, DefaultTimeout)
</s> add uc, err := proxy.ParseUpstreamsConfig(defaultDNS,
upstream.Options{
Bootstrap: s.conf.BootstrapDNS,
Timeout: DefaultTimeout,
},
) </s> remove r, err := upstream.NewResolver("127.0.0.1:5354", 3*time.Second)
</s> add r, err := upstream.NewResolver("127.0.0.1:5354", upstream.Options{Timeout: 3 * time.Second}) </s> add "github.com/AdguardTeam/dnsproxy/upstream" | https://github.com/AdguardTeam/AdGuardHome/commit/a234b63da10eaae84e2854b3874dc8bc97bd3042 | internal/home/clients.go |
keep keep keep keep replace keep keep keep keep keep | <mask> assert.Nilf(t, err, "%s", err)
<mask> assert.Equal(t, http.StatusOK, resp.StatusCode)
<mask>
<mask> // test DNS over UDP
<mask> r, err := upstream.NewResolver("127.0.0.1:5354", 3*time.Second)
<mask> assert.Nil(t, err)
<mask> addrs, err := r.LookupIPAddr(context.TODO(), "static.adguard.com")
<mask> assert.Nil(t, err)
<mask> haveIP := len(addrs) != 0
<mask> assert.True(t, haveIP)
</s> Pull request: 2600 inconsistent response
Merge in DNS/adguard-home from 2600-upd-dnsproxy to master
Closes #2600.
Squashed commit of the following:
commit 4b1515395841f14d86bc85b5c516d14919b5dc25
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 18:39:19 2021 +0300
all: upd dnsproxy again, log changes
commit 8a866201f140655b0d2f58552a7ad9bcae91a173
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:53:48 2021 +0300
all: cleanup
commit ae81234c79a6dbc61cccbae9c1b9d0144bb7f506
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 14:49:28 2021 +0300
all: fix deps
commit 662384c366feaf553d9eba2b5e3be93774631ec5
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Mar 2 13:58:26 2021 +0300
all: upd dnsproxy version, fix functions' signatures </s> remove upstreamConfig, err := proxy.ParseUpstreamsConfig(upstreams, s.conf.BootstrapDNS, DefaultTimeout)
</s> add upstreamConfig, err := proxy.ParseUpstreamsConfig(upstreams,
upstream.Options{
Bootstrap: s.conf.BootstrapDNS,
Timeout: DefaultTimeout,
},
) </s> remove if _, err := upstream.NewResolver(boot, 0); err != nil {
</s> add if _, err := upstream.NewResolver(boot, upstream.Options{Timeout: 0}); err != nil { </s> remove uc, err := proxy.ParseUpstreamsConfig(defaultDNS, s.conf.BootstrapDNS, DefaultTimeout)
</s> add uc, err := proxy.ParseUpstreamsConfig(defaultDNS,
upstream.Options{
Bootstrap: s.conf.BootstrapDNS,
Timeout: DefaultTimeout,
},
) </s> remove _, err := proxy.ParseUpstreamsConfig(upstreams, []string{}, DefaultTimeout)
</s> add _, err := proxy.ParseUpstreamsConfig(upstreams,
upstream.Options{
Bootstrap: []string{},
Timeout: DefaultTimeout,
},
) </s> remove config, err := proxy.ParseUpstreamsConfig(c.Upstreams, config.DNS.BootstrapDNS, dnsforward.DefaultTimeout)
</s> add config, err := proxy.ParseUpstreamsConfig(c.Upstreams,
upstream.Options{
Bootstrap: config.DNS.BootstrapDNS,
Timeout: dnsforward.DefaultTimeout,
},
) </s> add "github.com/AdguardTeam/dnsproxy/upstream" | https://github.com/AdguardTeam/AdGuardHome/commit/a234b63da10eaae84e2854b3874dc8bc97bd3042 | internal/home/home_test.go |
keep add keep keep keep keep keep | <mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/dnsforward"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> yaml "gopkg.in/yaml.v2"
<mask> )
<mask>
<mask> const (
</s> * use golibs v0.1.1: file.SafeWrite() </s> add "github.com/AdguardTeam/golibs/file" </s> add "github.com/AdguardTeam/golibs/file" </s> remove github.com/AdguardTeam/golibs v0.1.0
</s> add github.com/AdguardTeam/golibs v0.1.1 </s> remove // ----------------------------------
// helper functions for working with files
// ----------------------------------
// Writes data first to a temporary file and then renames it to what's specified in path
func safeWriteFile(path string, data []byte) error {
dir := filepath.Dir(path)
err := os.MkdirAll(dir, 0755)
if err != nil {
return err
}
tmpPath := path + ".tmp"
err = ioutil.WriteFile(tmpPath, data, 0644)
if err != nil {
return err
}
return os.Rename(tmpPath, path)
}
</s> add </s> remove err = safeWriteFile(configFile, body)
</s> add err = file.SafeWrite(configFile, body) </s> remove "io/ioutil"
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/a2e9d6945200bce5f270fbe95dedd65a0d08b5e4 | config.go |
keep keep keep keep replace keep keep keep keep keep | <mask> if err != nil {
<mask> log.Error("Couldn't generate YAML file: %s", err)
<mask> return err
<mask> }
<mask> err = safeWriteFile(configFile, yamlText)
<mask> if err != nil {
<mask> log.Error("Couldn't save YAML config: %s", err)
<mask> return err
<mask> }
<mask>
</s> * use golibs v0.1.1: file.SafeWrite() </s> remove err = safeWriteFile(configFile, body)
</s> add err = file.SafeWrite(configFile, body) </s> remove // ----------------------------------
// helper functions for working with files
// ----------------------------------
// Writes data first to a temporary file and then renames it to what's specified in path
func safeWriteFile(path string, data []byte) error {
dir := filepath.Dir(path)
err := os.MkdirAll(dir, 0755)
if err != nil {
return err
}
tmpPath := path + ".tmp"
err = ioutil.WriteFile(tmpPath, data, 0644)
if err != nil {
return err
}
return os.Rename(tmpPath, path)
}
</s> add </s> remove err := safeWriteFile(filterFilePath, body)
</s> add err := file.SafeWrite(filterFilePath, body) </s> add "github.com/AdguardTeam/golibs/file" </s> add "github.com/AdguardTeam/golibs/file" </s> remove "io/ioutil"
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/a2e9d6945200bce5f270fbe95dedd65a0d08b5e4 | config.go |
keep keep keep add keep keep keep keep keep keep | <mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> var (
<mask> nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID
<mask> filterTitleRegexp = regexp.MustCompile(`^! Title: +(.*)$`)
</s> * use golibs v0.1.1: file.SafeWrite() </s> add "github.com/AdguardTeam/golibs/file" </s> add "github.com/AdguardTeam/golibs/file" </s> remove err = safeWriteFile(configFile, body)
</s> add err = file.SafeWrite(configFile, body) </s> remove err = safeWriteFile(configFile, yamlText)
</s> add err = file.SafeWrite(configFile, yamlText) </s> remove // ----------------------------------
// helper functions for working with files
// ----------------------------------
// Writes data first to a temporary file and then renames it to what's specified in path
func safeWriteFile(path string, data []byte) error {
dir := filepath.Dir(path)
err := os.MkdirAll(dir, 0755)
if err != nil {
return err
}
tmpPath := path + ".tmp"
err = ioutil.WriteFile(tmpPath, data, 0644)
if err != nil {
return err
}
return os.Rename(tmpPath, path)
}
</s> add </s> remove github.com/AdguardTeam/golibs v0.1.0
</s> add github.com/AdguardTeam/golibs v0.1.1 | https://github.com/AdguardTeam/AdGuardHome/commit/a2e9d6945200bce5f270fbe95dedd65a0d08b5e4 | filter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> filterFilePath := filter.Path()
<mask> log.Printf("Saving filter %d contents to: %s", filter.ID, filterFilePath)
<mask> body := []byte(strings.Join(filter.Rules, "\n"))
<mask>
<mask> err := safeWriteFile(filterFilePath, body)
<mask>
<mask> // update LastUpdated field after saving the file
<mask> filter.LastUpdated = filter.LastTimeUpdated()
<mask> return err
<mask> }
</s> * use golibs v0.1.1: file.SafeWrite() </s> remove // ----------------------------------
// helper functions for working with files
// ----------------------------------
// Writes data first to a temporary file and then renames it to what's specified in path
func safeWriteFile(path string, data []byte) error {
dir := filepath.Dir(path)
err := os.MkdirAll(dir, 0755)
if err != nil {
return err
}
tmpPath := path + ".tmp"
err = ioutil.WriteFile(tmpPath, data, 0644)
if err != nil {
return err
}
return os.Rename(tmpPath, path)
}
</s> add </s> remove err = safeWriteFile(configFile, body)
</s> add err = file.SafeWrite(configFile, body) </s> remove err = safeWriteFile(configFile, yamlText)
</s> add err = file.SafeWrite(configFile, yamlText) </s> add "github.com/AdguardTeam/golibs/file" </s> add "github.com/AdguardTeam/golibs/file" </s> remove github.com/AdguardTeam/golibs v0.1.0
</s> add github.com/AdguardTeam/golibs v0.1.1 | https://github.com/AdguardTeam/AdGuardHome/commit/a2e9d6945200bce5f270fbe95dedd65a0d08b5e4 | filter.go |
keep keep keep keep replace keep keep keep keep keep | <mask> go 1.12
<mask>
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.11.2
<mask> github.com/AdguardTeam/golibs v0.1.0
<mask> github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f // indirect
<mask> github.com/bluele/gcache v0.0.0-20171010155617-472614239ac7
<mask> github.com/go-ole/go-ole v1.2.1 // indirect
<mask> github.com/go-test/deep v1.0.1
<mask> github.com/gobuffalo/packr v1.19.0
</s> * use golibs v0.1.1: file.SafeWrite() </s> remove github.com/AdguardTeam/golibs v0.1.0 h1:Mo1QNKC8eSbqczhxfdBXYCrUMwvgCyCwZFyWv+2Gdng=
</s> add </s> add github.com/AdguardTeam/golibs v0.1.1 h1:aepIN7yulf8I4Ub2c0cAaIizfSHPVXB2wrh8j4BJxl4=
github.com/AdguardTeam/golibs v0.1.1/go.mod h1:b0XkhgIcn2TxwX6C5AQMtpIFAgjPehNgxJErWkwA3ko= </s> add "github.com/AdguardTeam/golibs/file" </s> add "github.com/AdguardTeam/golibs/file" </s> remove // ----------------------------------
// helper functions for working with files
// ----------------------------------
// Writes data first to a temporary file and then renames it to what's specified in path
func safeWriteFile(path string, data []byte) error {
dir := filepath.Dir(path)
err := os.MkdirAll(dir, 0755)
if err != nil {
return err
}
tmpPath := path + ".tmp"
err = ioutil.WriteFile(tmpPath, data, 0644)
if err != nil {
return err
}
return os.Rename(tmpPath, path)
}
</s> add </s> add "github.com/AdguardTeam/golibs/file" | https://github.com/AdguardTeam/AdGuardHome/commit/a2e9d6945200bce5f270fbe95dedd65a0d08b5e4 | go.mod |
keep keep replace keep keep keep keep keep | <mask> github.com/AdguardTeam/dnsproxy v0.11.2 h1:S/Ag2q9qoZsmW1fvMohPZP7/5amEtz8NmFCp8kxUalQ=
<mask> github.com/AdguardTeam/dnsproxy v0.11.2/go.mod h1:EPp92b5cYR7HZpO+OQu6xC7AyhUoBaXW3sfa3exq/0I=
<mask> github.com/AdguardTeam/golibs v0.1.0 h1:Mo1QNKC8eSbqczhxfdBXYCrUMwvgCyCwZFyWv+2Gdng=
<mask> github.com/AdguardTeam/golibs v0.1.0/go.mod h1:zhi6xGwK4cMpjDocybhhLgvcGkstiSIjlpKbvyxC5Yc=
<mask> github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f h1:5ZfJxyXo8KyX8DgGXC5B7ILL8y51fci/qYz2B4j8iLY=
<mask> github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
<mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY=
<mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
</s> * use golibs v0.1.1: file.SafeWrite() </s> add github.com/AdguardTeam/golibs v0.1.1 h1:aepIN7yulf8I4Ub2c0cAaIizfSHPVXB2wrh8j4BJxl4=
github.com/AdguardTeam/golibs v0.1.1/go.mod h1:b0XkhgIcn2TxwX6C5AQMtpIFAgjPehNgxJErWkwA3ko= </s> remove github.com/AdguardTeam/golibs v0.1.0
</s> add github.com/AdguardTeam/golibs v0.1.1 </s> remove err = safeWriteFile(configFile, body)
</s> add err = file.SafeWrite(configFile, body) </s> add "github.com/AdguardTeam/golibs/file" </s> remove // ----------------------------------
// helper functions for working with files
// ----------------------------------
// Writes data first to a temporary file and then renames it to what's specified in path
func safeWriteFile(path string, data []byte) error {
dir := filepath.Dir(path)
err := os.MkdirAll(dir, 0755)
if err != nil {
return err
}
tmpPath := path + ".tmp"
err = ioutil.WriteFile(tmpPath, data, 0644)
if err != nil {
return err
}
return os.Rename(tmpPath, path)
}
</s> add </s> remove "io/ioutil"
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/a2e9d6945200bce5f270fbe95dedd65a0d08b5e4 | go.sum |
keep keep add keep keep keep keep | <mask> github.com/AdguardTeam/dnsproxy v0.11.2 h1:S/Ag2q9qoZsmW1fvMohPZP7/5amEtz8NmFCp8kxUalQ=
<mask> github.com/AdguardTeam/dnsproxy v0.11.2/go.mod h1:EPp92b5cYR7HZpO+OQu6xC7AyhUoBaXW3sfa3exq/0I=
<mask> github.com/AdguardTeam/golibs v0.1.0/go.mod h1:zhi6xGwK4cMpjDocybhhLgvcGkstiSIjlpKbvyxC5Yc=
<mask> github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f h1:5ZfJxyXo8KyX8DgGXC5B7ILL8y51fci/qYz2B4j8iLY=
<mask> github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
<mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY=
<mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
</s> * use golibs v0.1.1: file.SafeWrite() </s> remove github.com/AdguardTeam/golibs v0.1.0 h1:Mo1QNKC8eSbqczhxfdBXYCrUMwvgCyCwZFyWv+2Gdng=
</s> add </s> remove github.com/AdguardTeam/golibs v0.1.0
</s> add github.com/AdguardTeam/golibs v0.1.1 </s> remove err = safeWriteFile(configFile, body)
</s> add err = file.SafeWrite(configFile, body) </s> add "github.com/AdguardTeam/golibs/file" </s> remove // ----------------------------------
// helper functions for working with files
// ----------------------------------
// Writes data first to a temporary file and then renames it to what's specified in path
func safeWriteFile(path string, data []byte) error {
dir := filepath.Dir(path)
err := os.MkdirAll(dir, 0755)
if err != nil {
return err
}
tmpPath := path + ".tmp"
err = ioutil.WriteFile(tmpPath, data, 0644)
if err != nil {
return err
}
return os.Rename(tmpPath, path)
}
</s> add </s> remove "io/ioutil"
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/a2e9d6945200bce5f270fbe95dedd65a0d08b5e4 | go.sum |
keep keep keep keep replace keep keep keep keep keep | <mask> "bufio"
<mask> "errors"
<mask> "fmt"
<mask> "io"
<mask> "io/ioutil"
<mask> "net"
<mask> "net/http"
<mask> "net/url"
<mask> "os"
<mask> "path"
</s> * use golibs v0.1.1: file.SafeWrite() </s> remove err = safeWriteFile(configFile, body)
</s> add err = file.SafeWrite(configFile, body) </s> add "github.com/AdguardTeam/golibs/file" </s> remove // ----------------------------------
// helper functions for working with files
// ----------------------------------
// Writes data first to a temporary file and then renames it to what's specified in path
func safeWriteFile(path string, data []byte) error {
dir := filepath.Dir(path)
err := os.MkdirAll(dir, 0755)
if err != nil {
return err
}
tmpPath := path + ".tmp"
err = ioutil.WriteFile(tmpPath, data, 0644)
if err != nil {
return err
}
return os.Rename(tmpPath, path)
}
</s> add </s> add github.com/AdguardTeam/golibs v0.1.1 h1:aepIN7yulf8I4Ub2c0cAaIizfSHPVXB2wrh8j4BJxl4=
github.com/AdguardTeam/golibs v0.1.1/go.mod h1:b0XkhgIcn2TxwX6C5AQMtpIFAgjPehNgxJErWkwA3ko= </s> remove github.com/AdguardTeam/golibs v0.1.0 h1:Mo1QNKC8eSbqczhxfdBXYCrUMwvgCyCwZFyWv+2Gdng=
</s> add </s> remove github.com/AdguardTeam/golibs v0.1.0
</s> add github.com/AdguardTeam/golibs v0.1.1 | https://github.com/AdguardTeam/AdGuardHome/commit/a2e9d6945200bce5f270fbe95dedd65a0d08b5e4 | helpers.go |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask>
<mask> "github.com/joomcode/errorx"
<mask> )
<mask>
<mask> // ----------------------------------
<mask> // helper functions for working with files
<mask> // ----------------------------------
<mask>
<mask> // Writes data first to a temporary file and then renames it to what's specified in path
<mask> func safeWriteFile(path string, data []byte) error {
<mask> dir := filepath.Dir(path)
<mask> err := os.MkdirAll(dir, 0755)
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> tmpPath := path + ".tmp"
<mask> err = ioutil.WriteFile(tmpPath, data, 0644)
<mask> if err != nil {
<mask> return err
<mask> }
<mask> return os.Rename(tmpPath, path)
<mask> }
<mask>
<mask> // ----------------------------------
<mask> // helper functions for HTTP handlers
<mask> // ----------------------------------
<mask> func ensure(method string, handler func(http.ResponseWriter, *http.Request)) func(http.ResponseWriter, *http.Request) {
<mask> return func(w http.ResponseWriter, r *http.Request) {
</s> * use golibs v0.1.1: file.SafeWrite() </s> remove err = safeWriteFile(configFile, yamlText)
</s> add err = file.SafeWrite(configFile, yamlText) </s> remove err = safeWriteFile(configFile, body)
</s> add err = file.SafeWrite(configFile, body) </s> remove err := safeWriteFile(filterFilePath, body)
</s> add err := file.SafeWrite(filterFilePath, body) </s> add "github.com/AdguardTeam/golibs/file" </s> add "github.com/AdguardTeam/golibs/file" </s> remove github.com/AdguardTeam/golibs v0.1.0
</s> add github.com/AdguardTeam/golibs v0.1.1 | https://github.com/AdguardTeam/AdGuardHome/commit/a2e9d6945200bce5f270fbe95dedd65a0d08b5e4 | helpers.go |
keep add keep keep keep keep keep keep | <mask> "path/filepath"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> yaml "gopkg.in/yaml.v2"
<mask> )
<mask>
<mask> const currentSchemaVersion = 3 // used for upgrading from old configs to new config
<mask>
</s> * use golibs v0.1.1: file.SafeWrite() </s> add "github.com/AdguardTeam/golibs/file" </s> add "github.com/AdguardTeam/golibs/file" </s> remove // ----------------------------------
// helper functions for working with files
// ----------------------------------
// Writes data first to a temporary file and then renames it to what's specified in path
func safeWriteFile(path string, data []byte) error {
dir := filepath.Dir(path)
err := os.MkdirAll(dir, 0755)
if err != nil {
return err
}
tmpPath := path + ".tmp"
err = ioutil.WriteFile(tmpPath, data, 0644)
if err != nil {
return err
}
return os.Rename(tmpPath, path)
}
</s> add </s> remove err = safeWriteFile(configFile, body)
</s> add err = file.SafeWrite(configFile, body) </s> remove err = safeWriteFile(configFile, yamlText)
</s> add err = file.SafeWrite(configFile, yamlText) </s> remove err := safeWriteFile(filterFilePath, body)
</s> add err := file.SafeWrite(filterFilePath, body) | https://github.com/AdguardTeam/AdGuardHome/commit/a2e9d6945200bce5f270fbe95dedd65a0d08b5e4 | upgrade.go |
keep keep keep keep replace keep keep keep keep keep | <mask> log.Printf("Couldn't generate YAML file: %s", err)
<mask> return err
<mask> }
<mask>
<mask> err = safeWriteFile(configFile, body)
<mask> if err != nil {
<mask> log.Printf("Couldn't save YAML config: %s", err)
<mask> return err
<mask> }
<mask>
</s> * use golibs v0.1.1: file.SafeWrite() </s> remove err = safeWriteFile(configFile, yamlText)
</s> add err = file.SafeWrite(configFile, yamlText) </s> remove // ----------------------------------
// helper functions for working with files
// ----------------------------------
// Writes data first to a temporary file and then renames it to what's specified in path
func safeWriteFile(path string, data []byte) error {
dir := filepath.Dir(path)
err := os.MkdirAll(dir, 0755)
if err != nil {
return err
}
tmpPath := path + ".tmp"
err = ioutil.WriteFile(tmpPath, data, 0644)
if err != nil {
return err
}
return os.Rename(tmpPath, path)
}
</s> add </s> remove err := safeWriteFile(filterFilePath, body)
</s> add err := file.SafeWrite(filterFilePath, body) </s> add "github.com/AdguardTeam/golibs/file" </s> add "github.com/AdguardTeam/golibs/file" </s> remove "io/ioutil"
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/a2e9d6945200bce5f270fbe95dedd65a0d08b5e4 | upgrade.go |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> }
<mask> }
<mask>
<mask> func onDNSRequest(d *proxy.DNSContext) {
<mask> if d.Req.Question[0].Qtype == dns.TypeA {
<mask> ip, _, _ := net.SplitHostPort(d.Addr.String())
<mask> beginAsyncRDNS(ip)
<mask> }
<mask> }
<mask>
<mask> func generateServerConfig() dnsforward.ServerConfig {
<mask> filters := []dnsfilter.Filter{}
</s> Fix #706 -- rDNS for DOH/DOT clients </s> add ip := dnsforward.GetIPString(d.Addr)
if ip == "" {
// This would be quite weird if we get here
return
}
beginAsyncRDNS(ip) </s> remove
// getIPString is a helper function that extracts IP address from net.Addr
func getIPString(addr net.Addr) string {
switch addr := addr.(type) {
case *net.UDPAddr:
return addr.IP.String()
case *net.TCPAddr:
return addr.IP.String()
}
return ""
}
</s> add </s> remove import "testing"
</s> add import (
"testing"
) </s> remove ip := getIPString(addr)
</s> add ip := GetIPString(addr) | https://github.com/AdguardTeam/AdGuardHome/commit/a3b8d4d9237fcd726b7e4edfc729bd156efc1323 | dns.go |
keep add keep keep keep keep keep | <mask> return
<mask> }
<mask> }
<mask>
<mask> func generateServerConfig() dnsforward.ServerConfig {
<mask> filters := []dnsfilter.Filter{}
<mask> userFilter := userFilter()
</s> Fix #706 -- rDNS for DOH/DOT clients </s> remove if d.Req.Question[0].Qtype == dns.TypeA {
ip, _, _ := net.SplitHostPort(d.Addr.String())
beginAsyncRDNS(ip)
</s> add qType := d.Req.Question[0].Qtype
if qType != dns.TypeA && qType != dns.TypeAAAA {
return </s> remove
// getIPString is a helper function that extracts IP address from net.Addr
func getIPString(addr net.Addr) string {
switch addr := addr.(type) {
case *net.UDPAddr:
return addr.IP.String()
case *net.TCPAddr:
return addr.IP.String()
}
return ""
}
</s> add </s> remove import "testing"
</s> add import (
"testing"
) </s> remove ip := getIPString(addr)
</s> add ip := GetIPString(addr) | https://github.com/AdguardTeam/AdGuardHome/commit/a3b8d4d9237fcd726b7e4edfc729bd156efc1323 | dns.go |
keep keep replace keep keep keep keep keep | <mask> package main
<mask>
<mask> import "testing"
<mask>
<mask> func TestResolveRDNS(t *testing.T) {
<mask> config.DNS.BindHost = "1.1.1.1"
<mask> initDNSServer(".")
<mask> if r := resolveRDNS("1.1.1.1"); r != "one.one.one.one" {
</s> Fix #706 -- rDNS for DOH/DOT clients </s> remove if d.Req.Question[0].Qtype == dns.TypeA {
ip, _, _ := net.SplitHostPort(d.Addr.String())
beginAsyncRDNS(ip)
</s> add qType := d.Req.Question[0].Qtype
if qType != dns.TypeA && qType != dns.TypeAAAA {
return </s> remove ip := getIPString(addr)
</s> add ip := GetIPString(addr) </s> add ip := dnsforward.GetIPString(d.Addr)
if ip == "" {
// This would be quite weird if we get here
return
}
beginAsyncRDNS(ip) </s> remove
// getIPString is a helper function that extracts IP address from net.Addr
func getIPString(addr net.Addr) string {
switch addr := addr.(type) {
case *net.UDPAddr:
return addr.IP.String()
case *net.TCPAddr:
return addr.IP.String()
}
return ""
}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/a3b8d4d9237fcd726b7e4edfc729bd156efc1323 | dns_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> func (l *queryLog) logRequest(question *dns.Msg, answer *dns.Msg, result *dnsfilter.Result, elapsed time.Duration, addr net.Addr, upstream string) *logEntry {
<mask> var q []byte
<mask> var a []byte
<mask> var err error
<mask> ip := getIPString(addr)
<mask>
<mask> if question != nil {
<mask> q, err = question.Pack()
<mask> if err != nil {
<mask> log.Printf("failed to pack question for querylog: %s", err)
</s> Fix #706 -- rDNS for DOH/DOT clients </s> remove if d.Req.Question[0].Qtype == dns.TypeA {
ip, _, _ := net.SplitHostPort(d.Addr.String())
beginAsyncRDNS(ip)
</s> add qType := d.Req.Question[0].Qtype
if qType != dns.TypeA && qType != dns.TypeAAAA {
return </s> remove import "testing"
</s> add import (
"testing"
) </s> add ip := dnsforward.GetIPString(d.Addr)
if ip == "" {
// This would be quite weird if we get here
return
}
beginAsyncRDNS(ip) </s> remove
// getIPString is a helper function that extracts IP address from net.Addr
func getIPString(addr net.Addr) string {
switch addr := addr.(type) {
case *net.UDPAddr:
return addr.IP.String()
case *net.TCPAddr:
return addr.IP.String()
}
return ""
}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/a3b8d4d9237fcd726b7e4edfc729bd156efc1323 | dnsforward/querylog.go |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace | <mask> }
<mask>
<mask> return answers
<mask> }
<mask>
<mask> // getIPString is a helper function that extracts IP address from net.Addr
<mask> func getIPString(addr net.Addr) string {
<mask> switch addr := addr.(type) {
<mask> case *net.UDPAddr:
<mask> return addr.IP.String()
<mask> case *net.TCPAddr:
<mask> return addr.IP.String()
<mask> }
<mask> return ""
<mask> }
</s> Fix #706 -- rDNS for DOH/DOT clients </s> add ip := dnsforward.GetIPString(d.Addr)
if ip == "" {
// This would be quite weird if we get here
return
}
beginAsyncRDNS(ip) </s> remove if d.Req.Question[0].Qtype == dns.TypeA {
ip, _, _ := net.SplitHostPort(d.Addr.String())
beginAsyncRDNS(ip)
</s> add qType := d.Req.Question[0].Qtype
if qType != dns.TypeA && qType != dns.TypeAAAA {
return </s> remove ip := getIPString(addr)
</s> add ip := GetIPString(addr) </s> remove import "testing"
</s> add import (
"testing"
) | https://github.com/AdguardTeam/AdGuardHome/commit/a3b8d4d9237fcd726b7e4edfc729bd156efc1323 | dnsforward/querylog.go |
keep keep replace keep keep replace replace | <mask> import (
<mask> "fmt"
<mask> "io/ioutil"
<mask> "math/rand"
<mask> "net"
<mask> "os"
<mask> "runtime"
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> add "github.com/stretchr/testify/require" </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), </s> add require.NotEmpty(t, topClients) </s> remove s, _ := createObject(conf)
e := Entry{}
e.Domain = "domain"
e.Client = "127.0.0.1"
e.Result = RFiltered
e.Time = 123456
s.Update(e)
e.Domain = "domain"
e.Client = "127.0.0.1"
e.Result = RNotFiltered
e.Time = 123456
s.Update(e)
</s> add s.Update(Entry{
Domain: "domain",
Client: "127.0.0.1",
Result: RFiltered,
Time: 123456,
})
s.Update(Entry{
Domain: "domain",
Client: "127.0.0.1",
Result: RNotFiltered,
Time: 123456,
}) </s> remove assert.True(t, ok)
</s> add require.True(t, ok) | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/querylog/qlog_test.go |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> func TestMain(m *testing.M) {
<mask> aghtest.DiscardLogOutput(m)
<mask> }
<mask>
<mask> func prepareTestDir(t *testing.T) string {
<mask> t.Helper()
<mask>
<mask> wd, err := os.Getwd()
<mask> require.Nil(t, err)
<mask>
<mask> dir, err := ioutil.TempDir(wd, "agh-tests")
<mask> require.Nil(t, err)
<mask> require.NotEmpty(t, dir)
<mask>
<mask> t.Cleanup(func() {
<mask> // TODO(e.burkov): Replace with t.TempDir methods after updating
<mask> // go version to 1.15.
<mask> start := time.Now()
<mask> for {
<mask> err := os.RemoveAll(dir)
<mask> if err == nil {
<mask> break
<mask> }
<mask>
<mask> if runtime.GOOS != "windows" || time.Since(start) >= 500*time.Millisecond {
<mask> break
<mask> }
<mask> time.Sleep(5 * time.Millisecond)
<mask> }
<mask>
<mask> assert.Nil(t, err)
<mask> })
<mask>
<mask> return dir
<mask> }
<mask>
<mask> // TestQueryLog tests adding and loading (with filtering) entries from disk and
<mask> // memory.
<mask> func TestQueryLog(t *testing.T) {
<mask> l := newQueryLog(Config{
<mask> Enabled: true,
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove func prepareTestDir() string {
const dir = "./agh-test"
_ = os.RemoveAll(dir)
_ = os.MkdirAll(dir, 0o755)
return dir
</s> add func prepareTestFile(t *testing.T) (f *os.File) {
t.Helper()
dir := aghtest.PrepareTestDir(t)
f, err := ioutil.TempFile(dir, "")
require.Nil(t, err)
require.NotNil(t, f)
t.Cleanup(func() {
assert.Nil(t, f.Close())
})
return f </s> remove if err != nil {
t.Fatalf("Cannot get net interfaces: %s", err)
}
if len(ifaces) == 0 {
t.Fatalf("No net interfaces found")
}
</s> add require.Nilf(t, err, "Cannot get net interfaces: %s", err)
require.NotEmpty(t, ifaces, "No net interfaces found") </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> add s.Close() </s> remove f, err := ioutil.TempFile(prepareTestDir(t), "*.txt")
</s> add f, err := ioutil.TempFile(aghtest.PrepareTestDir(t), "*.txt") | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/querylog/qlog_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> Enabled: true,
<mask> FileEnabled: true,
<mask> Interval: 1,
<mask> MemSize: 100,
<mask> BaseDir: prepareTestDir(t),
<mask> })
<mask>
<mask> // Add disk entries.
<mask> addEntry(l, "example.org", net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1))
<mask> // Write to disk (first file).
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), </s> add require.NotEmpty(t, m) </s> remove func prepareTestDir(t *testing.T) string {
t.Helper()
wd, err := os.Getwd()
require.Nil(t, err)
dir, err := ioutil.TempDir(wd, "agh-tests")
require.Nil(t, err)
require.NotEmpty(t, dir)
t.Cleanup(func() {
// TODO(e.burkov): Replace with t.TempDir methods after updating
// go version to 1.15.
start := time.Now()
for {
err := os.RemoveAll(dir)
if err == nil {
break
}
if runtime.GOOS != "windows" || time.Since(start) >= 500*time.Millisecond {
break
}
time.Sleep(5 * time.Millisecond)
}
assert.Nil(t, err)
})
return dir
}
</s> add </s> remove // log.SetLevel(log.DEBUG)
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/querylog/qlog_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> l := newQueryLog(Config{
<mask> Enabled: true,
<mask> Interval: 1,
<mask> MemSize: 100,
<mask> BaseDir: prepareTestDir(t),
<mask> })
<mask>
<mask> const (
<mask> entNum = 10
<mask> firstPageDomain = "first.example.org"
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), </s> remove func prepareTestDir(t *testing.T) string {
t.Helper()
wd, err := os.Getwd()
require.Nil(t, err)
dir, err := ioutil.TempDir(wd, "agh-tests")
require.Nil(t, err)
require.NotEmpty(t, dir)
t.Cleanup(func() {
// TODO(e.burkov): Replace with t.TempDir methods after updating
// go version to 1.15.
start := time.Now()
for {
err := os.RemoveAll(dir)
if err == nil {
break
}
if runtime.GOOS != "windows" || time.Since(start) >= 500*time.Millisecond {
break
}
time.Sleep(5 * time.Millisecond)
}
assert.Nil(t, err)
})
return dir
}
</s> add </s> add if filesNum == 0 {
return []string{}
}
</s> add s.Close() | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/querylog/qlog_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> Enabled: true,
<mask> FileEnabled: true,
<mask> Interval: 1,
<mask> MemSize: 100,
<mask> BaseDir: prepareTestDir(t),
<mask> })
<mask>
<mask> const entNum = 10
<mask> // Add entries to the log.
<mask> for i := 0; i < entNum; i++ {
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), </s> remove s, _ := createObject(conf)
e := Entry{}
n := 1000 // number of distinct clients and domains every hour
for h := 0; h != 12; h++ {
if h != 0 {
atomic.AddInt32(&hour, 1)
}
for i := 0; i != n; i++ {
e.Domain = fmt.Sprintf("domain%d", i)
ip := net.IP{127, 0, 0, 1}
ip[2] = byte((i & 0xff00) >> 8)
ip[3] = byte(i & 0xff)
e.Client = ip.String()
e.Result = RNotFiltered
e.Time = 123456
s.Update(e)
</s> add // Number of distinct clients and domains every hour.
const n = 1000
for h := 0; h < 12; h++ {
atomic.AddInt32(&hour, 1)
for i := 0; i < n; i++ {
s.Update(Entry{
Domain: fmt.Sprintf("domain%d", i),
Client: net.IP{
127,
0,
byte((i & 0xff00) >> 8),
byte(i & 0xff),
}.String(),
Result: RNotFiltered,
Time: 123456,
}) </s> remove func TestAggregateDataPerTimeUnit(t *testing.T) {
for i := 0; i != 25; i++ {
alen := aggregateDataPerDay(uint32(i))
assert.Equalf(t, 30, alen, "i=%d", i)
}
</s> add t.Run("hours", func(t *testing.T) {
statsData := statsCollector(units, 0, Hours, ng)
assert.Len(t, statsData, 720)
})
t.Run("days", func(t *testing.T) {
for i := 0; i != 25; i++ {
statsData := statsCollector(units, uint32(i), Days, ng)
require.Lenf(t, statsData, 30, "i=%d", i)
}
}) </s> remove return len(a)
}
</s> add units := make([]*unitDB, 720) | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/querylog/qlog_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> Enabled: true,
<mask> FileEnabled: false,
<mask> Interval: 1,
<mask> MemSize: 2,
<mask> BaseDir: prepareTestDir(t),
<mask> })
<mask>
<mask> addEntry(l, "example1.org", net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1))
<mask> addEntry(l, "example2.org", net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1))
<mask> // The oldest entry is going to be removed from memory buffer.
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), </s> add require.NotEmpty(t, m) </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), </s> add require.NotEmpty(t, m) </s> add require.NotEmpty(t, m) | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/querylog/qlog_test.go |
keep keep add keep keep keep keep | <mask> "testing"
<mask> "time"
<mask>
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> add "github.com/stretchr/testify/require" </s> add "github.com/stretchr/testify/require" </s> add "github.com/stretchr/testify/require" </s> add "github.com/stretchr/testify/require" </s> add "github.com/stretchr/testify/require" </s> remove "os"
"runtime"
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/querylog/qlogfile_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> )
<mask>
<mask> // prepareTestFiles prepares several test query log files, each with the
<mask> // specified lines count.
<mask> func prepareTestFiles(t *testing.T, dir string, filesNum, linesNum int) []string {
<mask> t.Helper()
<mask>
<mask> const strV = "\"%s\""
<mask> const nl = "\n"
<mask> const format = `{"IP":` + strV + `,"T":` + strV + `,` +
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> add if filesNum == 0 {
return []string{}
}
</s> remove func prepareTestFile(t *testing.T, dir string, linesCount int) string {
</s> add func prepareTestFile(t *testing.T, linesCount int) string { </s> remove dhcpcdConf := nl + `interface wlan0` + nl +
`static ip_address=192.168.0.2/24` + nl +
`static routers=192.168.0.1` + nl +
`static domain_name_servers=192.168.0.2` + nl + nl
s := updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", net.IP{192, 168, 0, 1}, net.IP{192, 168, 0, 2})
assert.Equal(t, dhcpcdConf, s)
// without gateway
dhcpcdConf = nl + `interface wlan0` + nl +
`static ip_address=192.168.0.2/24` + nl +
`static domain_name_servers=192.168.0.2` + nl + nl
</s> add testCases := []struct {
name string
dhcpcdConf string
routers net.IP
}{{
name: "with_gateway",
dhcpcdConf: nl + `interface wlan0` + nl +
`static ip_address=192.168.0.2/24` + nl +
`static routers=192.168.0.1` + nl +
`static domain_name_servers=192.168.0.2` + nl + nl,
routers: net.IP{192, 168, 0, 1},
}, {
name: "without_gateway",
dhcpcdConf: nl + `interface wlan0` + nl +
`static ip_address=192.168.0.2/24` + nl +
`static domain_name_servers=192.168.0.2` + nl + nl,
routers: nil,
}} </s> remove s = updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", nil, net.IP{192, 168, 0, 2})
assert.Equal(t, dhcpcdConf, s)
</s> add for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
s := updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", tc.routers, net.IP{192, 168, 0, 2})
assert.Equal(t, tc.dhcpcdConf, s)
})
} </s> add "github.com/stretchr/testify/require" </s> remove return prepareTestFiles(t, dir, 1, linesCount)[0]
</s> add return prepareTestFiles(t, 1, linesCount)[0] | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/querylog/qlogfile_test.go |
keep add keep keep keep keep | <mask> t.Helper()
<mask>
<mask> const strV = "\"%s\""
<mask> const nl = "\n"
<mask> const format = `{"IP":` + strV + `,"T":` + strV + `,` +
<mask> `"QH":"example.org","QT":"A","QC":"IN",` +
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove func prepareTestFiles(t *testing.T, dir string, filesNum, linesNum int) []string {
</s> add func prepareTestFiles(t *testing.T, filesNum, linesNum int) []string { </s> remove dhcpcdConf := nl + `interface wlan0` + nl +
`static ip_address=192.168.0.2/24` + nl +
`static routers=192.168.0.1` + nl +
`static domain_name_servers=192.168.0.2` + nl + nl
s := updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", net.IP{192, 168, 0, 1}, net.IP{192, 168, 0, 2})
assert.Equal(t, dhcpcdConf, s)
// without gateway
dhcpcdConf = nl + `interface wlan0` + nl +
`static ip_address=192.168.0.2/24` + nl +
`static domain_name_servers=192.168.0.2` + nl + nl
</s> add testCases := []struct {
name string
dhcpcdConf string
routers net.IP
}{{
name: "with_gateway",
dhcpcdConf: nl + `interface wlan0` + nl +
`static ip_address=192.168.0.2/24` + nl +
`static routers=192.168.0.1` + nl +
`static domain_name_servers=192.168.0.2` + nl + nl,
routers: net.IP{192, 168, 0, 1},
}, {
name: "without_gateway",
dhcpcdConf: nl + `interface wlan0` + nl +
`static ip_address=192.168.0.2/24` + nl +
`static domain_name_servers=192.168.0.2` + nl + nl,
routers: nil,
}} </s> remove s = updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", nil, net.IP{192, 168, 0, 2})
assert.Equal(t, dhcpcdConf, s)
</s> add for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
s := updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", tc.routers, net.IP{192, 168, 0, 2})
assert.Equal(t, tc.dhcpcdConf, s)
})
} </s> add "github.com/stretchr/testify/require" </s> remove // this code is a chunk copied from getData() that generates aggregate data per day
func aggregateDataPerDay(firstID uint32) int {
firstDayID := (firstID + 24 - 1) / 24 * 24 // align_ceil(24)
a := []uint64{}
var sum uint64
id := firstDayID
nextDayID := firstDayID + 24
for i := firstDayID - firstID; int(i) != 720; i++ {
sum++
if id == nextDayID {
a = append(a, sum)
sum = 0
nextDayID += 24
}
id++
}
if id <= nextDayID {
a = append(a, sum)
</s> add func TestStatsCollector(t *testing.T) {
ng := func(_ *unitDB) uint64 {
return 0 </s> remove assert.True(t, ok)
assert.EqualValues(t, int(hour)*n, d.NumDNSQueries)
s.Close()
</s> add require.True(t, ok)
assert.EqualValues(t, hour*n, d.NumDNSQueries) | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/querylog/qlogfile_test.go |
keep add keep keep keep keep keep | <mask> lineIP := uint32(0)
<mask>
<mask> files := make([]string, filesNum)
<mask> for j := range files {
<mask> f, err := ioutil.TempFile(dir, "*.txt")
<mask> require.Nil(t, err)
<mask> files[filesNum-j-1] = f.Name()
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove f, err := ioutil.TempFile(prepareTestDir(t), "*.txt")
</s> add f, err := ioutil.TempFile(aghtest.PrepareTestDir(t), "*.txt") </s> remove dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
</s> add for _, str := range strs {
n, err := f.WriteString(str)
require.Nil(t, err)
assert.Equal(t, n, len(str))
}
} </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove assert.Nil(t, err)
</s> add require.Nil(t, err) </s> remove func prepareTestDir() string {
const dir = "./agh-test"
_ = os.RemoveAll(dir)
_ = os.MkdirAll(dir, 0o755)
return dir
</s> add func prepareTestFile(t *testing.T) (f *os.File) {
t.Helper()
dir := aghtest.PrepareTestDir(t)
f, err := ioutil.TempFile(dir, "")
require.Nil(t, err)
require.NotNil(t, f)
t.Cleanup(func() {
assert.Nil(t, f.Close())
})
return f </s> remove ah := AutoHosts{}
</s> add ah := &AutoHosts{} | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/querylog/qlogfile_test.go |
keep keep replace keep keep replace keep keep keep | <mask> // prepareTestFile prepares a test query log file with the specified number of
<mask> // lines.
<mask> func prepareTestFile(t *testing.T, dir string, linesCount int) string {
<mask> t.Helper()
<mask>
<mask> return prepareTestFiles(t, dir, 1, linesCount)[0]
<mask> }
<mask>
<mask> // newTestQLogFile creates new *QLogFile for tests and registers the required
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove func prepareTestFiles(t *testing.T, dir string, filesNum, linesNum int) []string {
</s> add func prepareTestFiles(t *testing.T, filesNum, linesNum int) []string { </s> remove testFiles := prepareTestFiles(t, prepareTestDir(t), filesNum, linesNum)
</s> add testFiles := prepareTestFiles(t, filesNum, linesNum) </s> remove func prepareTestDir(t *testing.T) string {
t.Helper()
wd, err := os.Getwd()
require.Nil(t, err)
dir, err := ioutil.TempDir(wd, "agh-tests")
require.Nil(t, err)
require.NotEmpty(t, dir)
t.Cleanup(func() {
// TODO(e.burkov): Replace with t.TempDir methods after updating
// go version to 1.15.
start := time.Now()
for {
err := os.RemoveAll(dir)
if err == nil {
break
}
if runtime.GOOS != "windows" || time.Since(start) >= 500*time.Millisecond {
break
}
time.Sleep(5 * time.Millisecond)
}
assert.Nil(t, err)
})
return dir
}
</s> add </s> remove testFile := prepareTestFile(t, prepareTestDir(t), linesNum)
</s> add testFile := prepareTestFile(t, linesNum) </s> remove func prepareTestDir() string {
const dir = "./agh-test"
_ = os.RemoveAll(dir)
_ = os.MkdirAll(dir, 0o755)
return dir
</s> add func prepareTestFile(t *testing.T) (f *os.File) {
t.Helper()
dir := aghtest.PrepareTestDir(t)
f, err := ioutil.TempFile(dir, "")
require.Nil(t, err)
require.NotNil(t, f)
t.Cleanup(func() {
assert.Nil(t, f.Close())
})
return f | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/querylog/qlogfile_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> // cleanup functions.
<mask> func newTestQLogFile(t *testing.T, linesNum int) (file *QLogFile) {
<mask> t.Helper()
<mask>
<mask> testFile := prepareTestFile(t, prepareTestDir(t), linesNum)
<mask>
<mask> // Create the new QLogFile instance.
<mask> file, err := NewQLogFile(testFile)
<mask> require.Nil(t, err)
<mask> assert.NotNil(t, file)
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove testFiles := prepareTestFiles(t, prepareTestDir(t), filesNum, linesNum)
</s> add testFiles := prepareTestFiles(t, filesNum, linesNum) </s> remove return prepareTestFiles(t, dir, 1, linesCount)[0]
</s> add return prepareTestFiles(t, 1, linesCount)[0] </s> remove f, err := ioutil.TempFile(prepareTestDir(t), "*.txt")
</s> add f, err := ioutil.TempFile(aghtest.PrepareTestDir(t), "*.txt") </s> remove func prepareTestFiles(t *testing.T, dir string, filesNum, linesNum int) []string {
</s> add func prepareTestFiles(t *testing.T, filesNum, linesNum int) []string { </s> remove func prepareTestFile(t *testing.T, dir string, linesCount int) string {
</s> add func prepareTestFile(t *testing.T, linesCount int) string { </s> remove func prepareTestDir(t *testing.T) string {
t.Helper()
wd, err := os.Getwd()
require.Nil(t, err)
dir, err := ioutil.TempDir(wd, "agh-tests")
require.Nil(t, err)
require.NotEmpty(t, dir)
t.Cleanup(func() {
// TODO(e.burkov): Replace with t.TempDir methods after updating
// go version to 1.15.
start := time.Now()
for {
err := os.RemoveAll(dir)
if err == nil {
break
}
if runtime.GOOS != "windows" || time.Since(start) >= 500*time.Millisecond {
break
}
time.Sleep(5 * time.Millisecond)
}
assert.Nil(t, err)
})
return dir
}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/querylog/qlogfile_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> assert.Empty(t, line)
<mask> }
<mask>
<mask> func NewTestQLogFileData(t *testing.T, data string) (file *QLogFile) {
<mask> f, err := ioutil.TempFile(prepareTestDir(t), "*.txt")
<mask> require.Nil(t, err)
<mask> t.Cleanup(func() {
<mask> assert.Nil(t, f.Close())
<mask> })
<mask>
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove func prepareTestDir() string {
const dir = "./agh-test"
_ = os.RemoveAll(dir)
_ = os.MkdirAll(dir, 0o755)
return dir
</s> add func prepareTestFile(t *testing.T) (f *os.File) {
t.Helper()
dir := aghtest.PrepareTestDir(t)
f, err := ioutil.TempFile(dir, "")
require.Nil(t, err)
require.NotNil(t, f)
t.Cleanup(func() {
assert.Nil(t, f.Close())
})
return f </s> remove testFile := prepareTestFile(t, prepareTestDir(t), linesNum)
</s> add testFile := prepareTestFile(t, linesNum) </s> add s, err := createObject(conf)
require.Nil(t, err) </s> add s, err := createObject(conf)
require.Nil(t, err) </s> add dir := aghtest.PrepareTestDir(t)
</s> add s.clear()
s.Close() | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/querylog/qlogfile_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> // required cleanup functions.
<mask> func newTestQLogReader(t *testing.T, filesNum, linesNum int) (reader *QLogReader) {
<mask> t.Helper()
<mask>
<mask> testFiles := prepareTestFiles(t, prepareTestDir(t), filesNum, linesNum)
<mask>
<mask> // Create the new QLogReader instance.
<mask> reader, err := NewQLogReader(testFiles)
<mask> require.Nil(t, err)
<mask> assert.NotNil(t, reader)
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove testFile := prepareTestFile(t, prepareTestDir(t), linesNum)
</s> add testFile := prepareTestFile(t, linesNum) </s> remove return prepareTestFiles(t, dir, 1, linesCount)[0]
</s> add return prepareTestFiles(t, 1, linesCount)[0] </s> remove func prepareTestFiles(t *testing.T, dir string, filesNum, linesNum int) []string {
</s> add func prepareTestFiles(t *testing.T, filesNum, linesNum int) []string { </s> remove func prepareTestFile(t *testing.T, dir string, linesCount int) string {
</s> add func prepareTestFile(t *testing.T, linesCount int) string { </s> remove f, err := ioutil.TempFile(prepareTestDir(t), "*.txt")
</s> add f, err := ioutil.TempFile(aghtest.PrepareTestDir(t), "*.txt") </s> remove func prepareTestDir(t *testing.T) string {
t.Helper()
wd, err := os.Getwd()
require.Nil(t, err)
dir, err := ioutil.TempDir(wd, "agh-tests")
require.Nil(t, err)
require.NotEmpty(t, dir)
t.Cleanup(func() {
// TODO(e.burkov): Replace with t.TempDir methods after updating
// go version to 1.15.
start := time.Now()
for {
err := os.RemoveAll(dir)
if err == nil {
break
}
if runtime.GOOS != "windows" || time.Since(start) >= 500*time.Millisecond {
break
}
time.Sleep(5 * time.Millisecond)
}
assert.Nil(t, err)
})
return dir
}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/querylog/qlogreader_test.go |
keep add keep keep keep keep keep keep | <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest"
<mask> "github.com/stretchr/testify/assert"
<mask> )
<mask>
<mask> func TestMain(m *testing.M) {
<mask> aghtest.DiscardLogOutput(m)
<mask> }
<mask>
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> add "github.com/stretchr/testify/require" </s> add "github.com/AdguardTeam/AdGuardHome/internal/aghtest" </s> remove func prepareTestDir() string {
const dir = "./agh-test"
_ = os.RemoveAll(dir)
_ = os.MkdirAll(dir, 0o755)
return dir
</s> add func prepareTestFile(t *testing.T) (f *os.File) {
t.Helper()
dir := aghtest.PrepareTestDir(t)
f, err := ioutil.TempFile(dir, "")
require.Nil(t, err)
require.NotNil(t, f)
t.Cleanup(func() {
assert.Nil(t, f.Close())
})
return f </s> remove func prepareTestDir(t *testing.T) string {
t.Helper()
wd, err := os.Getwd()
require.Nil(t, err)
dir, err := ioutil.TempDir(wd, "agh-tests")
require.Nil(t, err)
require.NotEmpty(t, dir)
t.Cleanup(func() {
// TODO(e.burkov): Replace with t.TempDir methods after updating
// go version to 1.15.
start := time.Now()
for {
err := os.RemoveAll(dir)
if err == nil {
break
}
if runtime.GOOS != "windows" || time.Since(start) >= 500*time.Millisecond {
break
}
time.Sleep(5 * time.Millisecond)
}
assert.Nil(t, err)
})
return dir
}
</s> add </s> add "github.com/stretchr/testify/require" </s> add "github.com/stretchr/testify/require" | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/stats/stats_test.go |
keep keep keep add keep keep keep keep keep keep | <mask> conf := Config{
<mask> Filename: "./stats.db",
<mask> LimitDays: 1,
<mask> }
<mask> t.Cleanup(func() {
<mask> s.clear()
<mask> s.Close()
<mask> assert.Nil(t, os.Remove(conf.Filename))
<mask> })
<mask>
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> add s, err := createObject(conf)
require.Nil(t, err) </s> remove // log.SetLevel(log.DEBUG)
</s> add </s> add s.clear()
s.Close() </s> add s.Close() </s> remove
s.clear()
s.Close()
</s> add </s> remove // use "atomic" to make Go race detector happy
</s> add // Use "atomic" to make go race detector happy. | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/stats/stats_test.go |
keep keep add keep keep keep keep | <mask> s, err := createObject(conf)
<mask> require.Nil(t, err)
<mask> t.Cleanup(func() {
<mask> assert.Nil(t, os.Remove(conf.Filename))
<mask> })
<mask>
<mask> s.Update(Entry{
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> add s, err := createObject(conf)
require.Nil(t, err) </s> add s, err := createObject(conf)
require.Nil(t, err) </s> add s.Close() </s> remove s, _ := createObject(conf)
e := Entry{}
e.Domain = "domain"
e.Client = "127.0.0.1"
e.Result = RFiltered
e.Time = 123456
s.Update(e)
e.Domain = "domain"
e.Client = "127.0.0.1"
e.Result = RNotFiltered
e.Time = 123456
s.Update(e)
</s> add s.Update(Entry{
Domain: "domain",
Client: "127.0.0.1",
Result: RFiltered,
Time: 123456,
})
s.Update(Entry{
Domain: "domain",
Client: "127.0.0.1",
Result: RNotFiltered,
Time: 123456,
}) </s> remove f, err := ioutil.TempFile(prepareTestDir(t), "*.txt")
</s> add f, err := ioutil.TempFile(aghtest.PrepareTestDir(t), "*.txt") </s> remove s, _ := createObject(conf)
e := Entry{}
n := 1000 // number of distinct clients and domains every hour
for h := 0; h != 12; h++ {
if h != 0 {
atomic.AddInt32(&hour, 1)
}
for i := 0; i != n; i++ {
e.Domain = fmt.Sprintf("domain%d", i)
ip := net.IP{127, 0, 0, 1}
ip[2] = byte((i & 0xff00) >> 8)
ip[3] = byte(i & 0xff)
e.Client = ip.String()
e.Result = RNotFiltered
e.Time = 123456
s.Update(e)
</s> add // Number of distinct clients and domains every hour.
const n = 1000
for h := 0; h < 12; h++ {
atomic.AddInt32(&hour, 1)
for i := 0; i < n; i++ {
s.Update(Entry{
Domain: fmt.Sprintf("domain%d", i),
Client: net.IP{
127,
0,
byte((i & 0xff00) >> 8),
byte(i & 0xff),
}.String(),
Result: RNotFiltered,
Time: 123456,
}) | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/stats/stats_test.go |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep replace keep keep keep | <mask> t.Cleanup(func() {
<mask> assert.Nil(t, os.Remove(conf.Filename))
<mask> })
<mask>
<mask> s, _ := createObject(conf)
<mask>
<mask> e := Entry{}
<mask>
<mask> e.Domain = "domain"
<mask> e.Client = "127.0.0.1"
<mask> e.Result = RFiltered
<mask> e.Time = 123456
<mask> s.Update(e)
<mask>
<mask> e.Domain = "domain"
<mask> e.Client = "127.0.0.1"
<mask> e.Result = RNotFiltered
<mask> e.Time = 123456
<mask> s.Update(e)
<mask>
<mask> d, ok := s.getData()
<mask> assert.True(t, ok)
<mask>
<mask> a := []uint64{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2}
<mask> assert.True(t, UIntArrayEquals(d.DNSQueries, a))
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> remove s, _ := createObject(conf)
e := Entry{}
n := 1000 // number of distinct clients and domains every hour
for h := 0; h != 12; h++ {
if h != 0 {
atomic.AddInt32(&hour, 1)
}
for i := 0; i != n; i++ {
e.Domain = fmt.Sprintf("domain%d", i)
ip := net.IP{127, 0, 0, 1}
ip[2] = byte((i & 0xff00) >> 8)
ip[3] = byte(i & 0xff)
e.Client = ip.String()
e.Result = RNotFiltered
e.Time = 123456
s.Update(e)
</s> add // Number of distinct clients and domains every hour.
const n = 1000
for h := 0; h < 12; h++ {
atomic.AddInt32(&hour, 1)
for i := 0; i < n; i++ {
s.Update(Entry{
Domain: fmt.Sprintf("domain%d", i),
Client: net.IP{
127,
0,
byte((i & 0xff00) >> 8),
byte(i & 0xff),
}.String(),
Result: RNotFiltered,
Time: 123456,
}) </s> remove // Check if we are notified about changes
ips = ah.Process("newhost", dns.TypeA)
assert.NotNil(t, ips)
assert.Len(t, ips, 1)
assert.True(t, net.IP{127, 0, 0, 2}.Equal(ips[0]))
</s> add t.Run("notified", func(t *testing.T) {
ips := ah.Process("newhost", dns.TypeA)
assert.NotNil(t, ips)
require.Len(t, ips, 1)
assert.True(t, net.IP{127, 0, 0, 2}.Equal(ips[0]))
}) </s> add require.NotEmpty(t, topClients) </s> remove
s.clear()
s.Close()
</s> add </s> remove func TestIP(t *testing.T) {
assert.True(t, net.IP{127, 0, 0, 1}.Equal(DNSUnreverseAddr("1.0.0.127.in-addr.arpa")))
assert.Equal(t, "::abcd:1234", DNSUnreverseAddr("4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa").String())
assert.Equal(t, "::abcd:1234", DNSUnreverseAddr("4.3.2.1.d.c.B.A.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa").String())
assert.Nil(t, DNSUnreverseAddr("1.0.0.127.in-addr.arpa."))
assert.Nil(t, DNSUnreverseAddr(".0.0.127.in-addr.arpa"))
assert.Nil(t, DNSUnreverseAddr(".3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa"))
assert.Nil(t, DNSUnreverseAddr("4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0..ip6.arpa"))
assert.Nil(t, DNSUnreverseAddr("4.3.2.1.d.c.b. .0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa"))
</s> add func TestDNSReverseAddr(t *testing.T) {
testCases := []struct {
name string
have string
want net.IP
}{{
name: "good_ipv4",
have: "1.0.0.127.in-addr.arpa",
want: net.IP{127, 0, 0, 1},
}, {
name: "good_ipv6",
have: "4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
want: net.ParseIP("::abcd:1234"),
}, {
name: "good_ipv6_case",
have: "4.3.2.1.d.c.B.A.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
want: net.ParseIP("::abcd:1234"),
}, {
name: "bad_ipv4_dot",
have: "1.0.0.127.in-addr.arpa.",
}, {
name: "wrong_ipv4",
have: ".0.0.127.in-addr.arpa",
}, {
name: "wrong_ipv6",
have: ".3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
}, {
name: "bad_ipv6_dot",
have: "4.3.2.1.d.c.b.a.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0..ip6.arpa",
}, {
name: "bad_ipv6_space",
have: "4.3.2.1.d.c.b. .0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.ip6.arpa",
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
ip := DNSUnreverseAddr(tc.have)
assert.True(t, tc.want.Equal(ip))
})
} | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/stats/stats_test.go |
keep add keep keep keep keep keep | <mask>
<mask> m := d.TopQueried
<mask> assert.EqualValues(t, 1, m[0]["domain"])
<mask>
<mask> m = d.TopBlocked
<mask> require.NotEmpty(t, m)
<mask> assert.EqualValues(t, 1, m[0]["domain"])
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> add require.NotEmpty(t, m) </s> add require.NotEmpty(t, m) </s> remove
s.clear()
s.Close()
</s> add </s> remove assert.True(t, ok)
assert.EqualValues(t, int(hour)*n, d.NumDNSQueries)
s.Close()
</s> add require.True(t, ok)
assert.EqualValues(t, hour*n, d.NumDNSQueries) </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/stats/stats_test.go |
keep keep keep add keep keep keep keep | <mask> require.NotEmpty(t, m)
<mask> assert.EqualValues(t, 1, m[0]["domain"])
<mask>
<mask> m = d.TopBlocked
<mask> assert.EqualValues(t, 1, m[0]["domain"])
<mask>
<mask> m = d.TopClients
<mask> require.NotEmpty(t, m)
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> add require.NotEmpty(t, m) </s> add require.NotEmpty(t, m) </s> remove
s.clear()
s.Close()
</s> add </s> add require.NotEmpty(t, topClients) </s> remove assert.True(t, ok)
assert.EqualValues(t, int(hour)*n, d.NumDNSQueries)
s.Close()
</s> add require.True(t, ok)
assert.EqualValues(t, hour*n, d.NumDNSQueries) </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/stats/stats_test.go |
keep keep keep add keep keep keep keep | <mask> require.NotEmpty(t, m)
<mask> assert.EqualValues(t, 1, m[0]["domain"])
<mask>
<mask> m = d.TopClients
<mask> assert.EqualValues(t, 2, m[0]["127.0.0.1"])
<mask>
<mask> assert.EqualValues(t, 2, d.NumDNSQueries)
<mask> assert.EqualValues(t, 1, d.NumBlockedFiltering)
</s> Pull request: 2639 use testify require vol.2
Merge in DNS/adguard-home from 2639-testify-require-2 to master
Updates #2639.
Squashed commit of the following:
commit 31cc29a166e2e48a73956853cbc6d6dd681ab6da
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 18:48:31 2021 +0300
all: deal with t.Run
commit 484f477fbfedd03aca4d322bc1cc9e131f30e1ce
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 17:44:02 2021 +0300
all: fix readability, imp tests
commit 1231a825b353c16e43eae1b660dbb4c87805f564
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Feb 9 16:06:29 2021 +0300
all: imp tests </s> add require.NotEmpty(t, m) </s> add require.NotEmpty(t, m) </s> remove assert.True(t, ok)
assert.EqualValues(t, int(hour)*n, d.NumDNSQueries)
s.Close()
</s> add require.True(t, ok)
assert.EqualValues(t, hour*n, d.NumDNSQueries) </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), </s> remove BaseDir: prepareTestDir(t),
</s> add BaseDir: aghtest.PrepareTestDir(t), </s> remove
s.clear()
s.Close()
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/a3dddd72c1cd864749355c49ef5313a447709638 | internal/stats/stats_test.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.