docstring_tokens
stringlengths 0
76.5k
| code_tokens
stringlengths 75
1.81M
| label_window
sequencelengths 4
2.12k
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|---|
e := f.load(filt) | <mask> r |= statusEnabledChanged
<mask> f.Enabled = newf.Enabled
<mask> if f.Enabled {
<mask> if (r & statusURLChanged) == 0 {
<mask> e := f.load()
<mask> if e != nil {
<mask> // This isn't a fatal error,
<mask> // because it may occur when someone removes the file from disk.
<mask> f.LastUpdated = time.Time{}
<mask> f.checksum = 0
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove f.Enabled = newf.Enabled
if f.Enabled {
</s> add filt.Enabled = newf.Enabled
if filt.Enabled { </s> remove f.LastUpdated = time.Time{}
f.checksum = 0
f.RulesCount = 0
</s> add filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0 </s> remove if f.Enabled != newf.Enabled {
</s> add if filt.Enabled != newf.Enabled { </s> remove f.URL = newf.URL
f.unload()
f.LastUpdated = time.Time{}
f.checksum = 0
f.RulesCount = 0
</s> add filt.URL = newf.URL
filt.unload()
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0 </s> remove func loadFilters(array []filter) {
</s> add func (f *Filtering) loadFilters(array []filter) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0 | <mask> e := f.load()
<mask> if e != nil {
<mask> // This isn't a fatal error,
<mask> // because it may occur when someone removes the file from disk.
<mask> f.LastUpdated = time.Time{}
<mask> f.checksum = 0
<mask> f.RulesCount = 0
<mask> r |= statusUpdateRequired
<mask> }
<mask> }
<mask> } else {
<mask> f.unload()
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove e := f.load()
</s> add e := f.load(filt) </s> remove f.Enabled = newf.Enabled
if f.Enabled {
</s> add filt.Enabled = newf.Enabled
if filt.Enabled { </s> remove f.URL = newf.URL
f.unload()
f.LastUpdated = time.Time{}
f.checksum = 0
f.RulesCount = 0
</s> add filt.URL = newf.URL
filt.unload()
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0 </s> remove if f.Enabled != newf.Enabled {
</s> add if filt.Enabled != newf.Enabled { </s> remove f.unload()
</s> add filt.unload() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
filt.unload() | <mask> r |= statusUpdateRequired
<mask> }
<mask> }
<mask> } else {
<mask> f.unload()
<mask> }
<mask> }
<mask>
<mask> return r | statusFound
<mask> }
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove f.URL = newf.URL
f.unload()
f.LastUpdated = time.Time{}
f.checksum = 0
f.RulesCount = 0
</s> add filt.URL = newf.URL
filt.unload()
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0 </s> remove f.LastUpdated = time.Time{}
f.checksum = 0
f.RulesCount = 0
</s> add filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0 </s> remove if f.URL != newf.URL {
</s> add if filt.URL != newf.URL { </s> remove f.URL, newf.Name, newf.URL, newf.Enabled)
f.Name = newf.Name
</s> add filt.URL, newf.Name, newf.URL, newf.Enabled)
filt.Name = newf.Name </s> remove func handleFilteringSetRules(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringSetRules(w http.ResponseWriter, r *http.Request) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
func (f *Filtering) loadFilters(array []filter) { | <mask> }
<mask>
<mask> // Load filters from the disk
<mask> // And if any filter has zero ID, assign a new one
<mask> func loadFilters(array []filter) {
<mask> for i := range array {
<mask> filter := &array[i] // otherwise we're operating on a copy
<mask> if filter.ID == 0 {
<mask> filter.ID = assignUniqueFilterID()
<mask> }
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove return rulesCount, name
</s> add return rulesCount, checksum, name
}
// Perform upgrade on a filter and update LastUpdated value
func (f *Filtering) update(filter *filter) (bool, error) {
b, err := f.updateIntl(filter)
filter.LastUpdated = time.Now()
if !b {
e := os.Chtimes(filter.Path(), filter.LastUpdated, filter.LastUpdated)
if e != nil {
log.Error("os.Chtimes(): %v", e)
}
}
return b, err </s> remove ok, err := f.update()
</s> add ok, err := f.update(&filt) </s> remove func periodicallyRefreshFilters() {
</s> add func (f *Filtering) periodicallyRefreshFilters() { </s> remove f := &(*filters)[i]
if f.URL != url {
</s> add filt := &(*filters)[i]
if filt.URL != url { </s> remove if updated {
err := uf.saveAndBackupOld()
if err != nil {
log.Printf("Failed to save the updated filter %d: %s", uf.ID, err)
continue
}
} else {
e := os.Chtimes(uf.Path(), uf.LastUpdated, uf.LastUpdated)
if e != nil {
log.Error("os.Chtimes(): %v", e)
}
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
err := f.load(filter) | <mask> // No need to load a filter that is not enabled
<mask> continue
<mask> }
<mask>
<mask> err := filter.load()
<mask> if err != nil {
<mask> log.Error("Couldn't load filter %d contents due to %s", filter.ID, err)
<mask> }
<mask> }
<mask> }
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove httpError(w, http.StatusBadRequest, "Filter at the url %s is invalid (maybe it points to blank page?)", f.URL)
return
}
// Save the filter contents
err = f.save()
if err != nil {
httpError(w, http.StatusBadRequest, "Failed to save filter %d due to %s", f.ID, err)
</s> add httpError(w, http.StatusBadRequest, "Filter at the url %s is invalid (maybe it points to blank page?)", filt.URL) </s> remove
return true, nil
}
// saves filter contents to the file in dataDir
// This method is safe to call during filters update,
// because it creates a new file and then renames it,
// so the currently opened file descriptors to the old filter file remain valid.
func (filter *filter) save() error {
</s> add </s> remove userFilter := userFilter()
err = userFilter.save()
if err != nil {
log.Error("Couldn't save the user filter: %s", err)
return err
}
</s> add </s> remove
err := file.SafeWrite(filterFilePath, filter.Data)
// update LastUpdated field after saving the file
filter.LastUpdated = filter.LastTimeUpdated()
return err
}
func (filter *filter) saveAndBackupOld() error {
filterFilePath := filter.Path()
err := os.Rename(filterFilePath, filterFilePath+".old")
if err != nil && !os.IsNotExist(err) {
return err
</s> add err = os.Rename(tmpfile.Name(), filterFilePath)
if err != nil {
return false, err </s> remove body, err := ioutil.ReadAll(resp.Body)
if err != nil {
log.Printf("Couldn't fetch filter contents from URL %s, skipping: %s", filter.URL, err)
return false, err
</s> add htmlTest := true
firstChunk := make([]byte, 4*1024)
firstChunkLen := 0
buf := make([]byte, 64*1024)
total := 0
for {
n, err := resp.Body.Read(buf)
total += n
if htmlTest {
// gather full buffer firstChunk and perform its data tests
num := util.MinInt(n, len(firstChunk)-firstChunkLen)
copied := copy(firstChunk[firstChunkLen:], buf[:num])
firstChunkLen += copied
if firstChunkLen == len(firstChunk) || err == io.EOF {
if !isPrintableText(firstChunk) {
return false, fmt.Errorf("Data contains non-printable characters")
}
s := strings.ToLower(string(firstChunk))
if strings.Index(s, "<html") >= 0 ||
strings.Index(s, "<!doctype") >= 0 {
return false, fmt.Errorf("Data is HTML, not plain text")
}
htmlTest = false
firstChunk = nil
}
}
_, err2 := tmpfile.Write(buf[:n])
if err2 != nil {
return false, err2
}
if err == io.EOF {
break
}
if err != nil {
log.Printf("Couldn't fetch filter contents from URL %s, skipping: %s", filter.URL, err)
return false, err
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
func (f *Filtering) periodicallyRefreshFilters() { | <mask> return value
<mask> }
<mask>
<mask> // Sets up a timer that will be checking for filters updates periodically
<mask> func periodicallyRefreshFilters() {
<mask> const maxInterval = 1 * 60 * 60
<mask> intval := 5 // use a dynamically increasing time interval
<mask> for {
<mask> isNetworkErr := false
<mask> if config.DNS.FiltersUpdateIntervalHours != 0 && atomic.CompareAndSwapUint32(&refreshStatus, 0, 1) {
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove if config.DNS.FiltersUpdateIntervalHours != 0 && atomic.CompareAndSwapUint32(&refreshStatus, 0, 1) {
refreshLock.Lock()
_, isNetworkErr = refreshFiltersIfNecessary(FilterRefreshBlocklists | FilterRefreshAllowlists)
refreshLock.Unlock()
refreshStatus = 0
</s> add if config.DNS.FiltersUpdateIntervalHours != 0 && atomic.CompareAndSwapUint32(&f.refreshStatus, 0, 1) {
f.refreshLock.Lock()
_, isNetworkErr = f.refreshFiltersIfNecessary(FilterRefreshBlocklists | FilterRefreshAllowlists)
f.refreshLock.Unlock()
f.refreshStatus = 0 </s> remove func refreshFilters(flags int, important bool) (int, error) {
set := atomic.CompareAndSwapUint32(&refreshStatus, 0, 1)
</s> add func (f *Filtering) refreshFilters(flags int, important bool) (int, error) {
set := atomic.CompareAndSwapUint32(&f.refreshStatus, 0, 1) </s> remove func loadFilters(array []filter) {
</s> add func (f *Filtering) loadFilters(array []filter) { </s> remove return rulesCount, name
</s> add return rulesCount, checksum, name
}
// Perform upgrade on a filter and update LastUpdated value
func (f *Filtering) update(filter *filter) (bool, error) {
b, err := f.updateIntl(filter)
filter.LastUpdated = time.Now()
if !b {
e := os.Chtimes(filter.Path(), filter.LastUpdated, filter.LastUpdated)
if e != nil {
log.Error("os.Chtimes(): %v", e)
}
}
return b, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
if config.DNS.FiltersUpdateIntervalHours != 0 && atomic.CompareAndSwapUint32(&f.refreshStatus, 0, 1) {
f.refreshLock.Lock()
_, isNetworkErr = f.refreshFiltersIfNecessary(FilterRefreshBlocklists | FilterRefreshAllowlists)
f.refreshLock.Unlock()
f.refreshStatus = 0 | <mask> const maxInterval = 1 * 60 * 60
<mask> intval := 5 // use a dynamically increasing time interval
<mask> for {
<mask> isNetworkErr := false
<mask> if config.DNS.FiltersUpdateIntervalHours != 0 && atomic.CompareAndSwapUint32(&refreshStatus, 0, 1) {
<mask> refreshLock.Lock()
<mask> _, isNetworkErr = refreshFiltersIfNecessary(FilterRefreshBlocklists | FilterRefreshAllowlists)
<mask> refreshLock.Unlock()
<mask> refreshStatus = 0
<mask> if !isNetworkErr {
<mask> intval = maxInterval
<mask> }
<mask> }
<mask>
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove func periodicallyRefreshFilters() {
</s> add func (f *Filtering) periodicallyRefreshFilters() { </s> remove refreshLock.Lock()
nUpdated, _ := refreshFiltersIfNecessary(flags)
refreshLock.Unlock()
refreshStatus = 0
</s> add f.refreshLock.Lock()
nUpdated, _ := f.refreshFiltersIfNecessary(flags)
f.refreshLock.Unlock()
f.refreshStatus = 0 </s> remove func refreshFilters(flags int, important bool) (int, error) {
set := atomic.CompareAndSwapUint32(&refreshStatus, 0, 1)
</s> add func (f *Filtering) refreshFilters(flags int, important bool) (int, error) {
set := atomic.CompareAndSwapUint32(&f.refreshStatus, 0, 1) </s> remove Timeout: time.Minute * 5,
</s> add Timeout: 5 * time.Second, </s> remove // Count lines in the filter
for len(data) != 0 {
line := util.SplitNext(&data, '\n')
</s> add checksum = crc32.Update(checksum, crc32.IEEETable, []byte(line))
line = strings.TrimSpace(line) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
func (f *Filtering) refreshFilters(flags int, important bool) (int, error) {
set := atomic.CompareAndSwapUint32(&f.refreshStatus, 0, 1) | <mask> // Refresh filters
<mask> // flags: FilterRefresh*
<mask> // important:
<mask> // TRUE: ignore the fact that we're currently updating the filters
<mask> func refreshFilters(flags int, important bool) (int, error) {
<mask> set := atomic.CompareAndSwapUint32(&refreshStatus, 0, 1)
<mask> if !important && !set {
<mask> return 0, fmt.Errorf("Filters update procedure is already running")
<mask> }
<mask>
<mask> refreshLock.Lock()
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove refreshLock.Lock()
nUpdated, _ := refreshFiltersIfNecessary(flags)
refreshLock.Unlock()
refreshStatus = 0
</s> add f.refreshLock.Lock()
nUpdated, _ := f.refreshFiltersIfNecessary(flags)
f.refreshLock.Unlock()
f.refreshStatus = 0 </s> remove func periodicallyRefreshFilters() {
</s> add func (f *Filtering) periodicallyRefreshFilters() { </s> remove if config.DNS.FiltersUpdateIntervalHours != 0 && atomic.CompareAndSwapUint32(&refreshStatus, 0, 1) {
refreshLock.Lock()
_, isNetworkErr = refreshFiltersIfNecessary(FilterRefreshBlocklists | FilterRefreshAllowlists)
refreshLock.Unlock()
refreshStatus = 0
</s> add if config.DNS.FiltersUpdateIntervalHours != 0 && atomic.CompareAndSwapUint32(&f.refreshStatus, 0, 1) {
f.refreshLock.Lock()
_, isNetworkErr = f.refreshFiltersIfNecessary(FilterRefreshBlocklists | FilterRefreshAllowlists)
f.refreshLock.Unlock()
f.refreshStatus = 0 </s> remove func refreshFiltersIfNecessary(flags int) (int, bool) {
</s> add func (f *Filtering) refreshFiltersIfNecessary(flags int) (int, bool) { </s> remove func loadFilters(array []filter) {
</s> add func (f *Filtering) loadFilters(array []filter) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
f.refreshLock.Lock()
nUpdated, _ := f.refreshFiltersIfNecessary(flags)
f.refreshLock.Unlock()
f.refreshStatus = 0 | <mask> if !important && !set {
<mask> return 0, fmt.Errorf("Filters update procedure is already running")
<mask> }
<mask>
<mask> refreshLock.Lock()
<mask> nUpdated, _ := refreshFiltersIfNecessary(flags)
<mask> refreshLock.Unlock()
<mask> refreshStatus = 0
<mask> return nUpdated, nil
<mask> }
<mask>
<mask> func refreshFiltersArray(filters *[]filter, force bool) (int, []filter, []bool, bool) {
<mask> var updateFilters []filter
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove func refreshFiltersArray(filters *[]filter, force bool) (int, []filter, []bool, bool) {
</s> add func (f *Filtering) refreshFiltersArray(filters *[]filter, force bool) (int, []filter, []bool, bool) { </s> remove func refreshFilters(flags int, important bool) (int, error) {
set := atomic.CompareAndSwapUint32(&refreshStatus, 0, 1)
</s> add func (f *Filtering) refreshFilters(flags int, important bool) (int, error) {
set := atomic.CompareAndSwapUint32(&f.refreshStatus, 0, 1) </s> remove if config.DNS.FiltersUpdateIntervalHours != 0 && atomic.CompareAndSwapUint32(&refreshStatus, 0, 1) {
refreshLock.Lock()
_, isNetworkErr = refreshFiltersIfNecessary(FilterRefreshBlocklists | FilterRefreshAllowlists)
refreshLock.Unlock()
refreshStatus = 0
</s> add if config.DNS.FiltersUpdateIntervalHours != 0 && atomic.CompareAndSwapUint32(&f.refreshStatus, 0, 1) {
f.refreshLock.Lock()
_, isNetworkErr = f.refreshFiltersIfNecessary(FilterRefreshBlocklists | FilterRefreshAllowlists)
f.refreshLock.Unlock()
f.refreshStatus = 0 </s> remove func refreshFiltersIfNecessary(flags int) (int, bool) {
</s> add func (f *Filtering) refreshFiltersIfNecessary(flags int) (int, bool) { </s> remove nUpdated, _ := refreshFilters(flags, true)
</s> add nUpdated, _ := f.refreshFilters(flags, true) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
func (f *Filtering) refreshFiltersArray(filters *[]filter, force bool) (int, []filter, []bool, bool) { | <mask> refreshStatus = 0
<mask> return nUpdated, nil
<mask> }
<mask>
<mask> func refreshFiltersArray(filters *[]filter, force bool) (int, []filter, []bool, bool) {
<mask> var updateFilters []filter
<mask> var updateFlags []bool // 'true' if filter data has changed
<mask>
<mask> now := time.Now()
<mask> config.RLock()
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove refreshLock.Lock()
nUpdated, _ := refreshFiltersIfNecessary(flags)
refreshLock.Unlock()
refreshStatus = 0
</s> add f.refreshLock.Lock()
nUpdated, _ := f.refreshFiltersIfNecessary(flags)
f.refreshLock.Unlock()
f.refreshStatus = 0 </s> remove func refreshFiltersIfNecessary(flags int) (int, bool) {
</s> add func (f *Filtering) refreshFiltersIfNecessary(flags int) (int, bool) { </s> remove updateCountW, updateFiltersW, updateFlagsW, netErrorW = refreshFiltersArray(&config.WhitelistFilters, force)
</s> add updateCountW, updateFiltersW, updateFlagsW, netErrorW = f.refreshFiltersArray(&config.WhitelistFilters, force) </s> remove updateCount, updateFilters, updateFlags, netError = refreshFiltersArray(&config.Filters, force)
</s> add updateCount, updateFilters, updateFlags, netError = f.refreshFiltersArray(&config.Filters, force) </s> remove func refreshFilters(flags int, important bool) (int, error) {
set := atomic.CompareAndSwapUint32(&refreshStatus, 0, 1)
</s> add func (f *Filtering) refreshFilters(flags int, important bool) (int, error) {
set := atomic.CompareAndSwapUint32(&f.refreshStatus, 0, 1) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
updated, err := f.update(uf) | <mask>
<mask> nfail := 0
<mask> for i := range updateFilters {
<mask> uf := &updateFilters[i]
<mask> updated, err := uf.update()
<mask> updateFlags = append(updateFlags, updated)
<mask> if err != nil {
<mask> nfail++
<mask> log.Printf("Failed to update filter %s: %s\n", uf.URL, err)
<mask> continue
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove uf.LastUpdated = now
</s> add </s> remove if updated {
err := uf.saveAndBackupOld()
if err != nil {
log.Printf("Failed to save the updated filter %d: %s", uf.ID, err)
continue
}
} else {
e := os.Chtimes(uf.Path(), uf.LastUpdated, uf.LastUpdated)
if e != nil {
log.Error("os.Chtimes(): %v", e)
}
}
</s> add </s> remove f := &(*filters)[i]
if f.URL != url {
</s> add filt := &(*filters)[i]
if filt.URL != url { </s> remove updateCountW, updateFiltersW, updateFlagsW, netErrorW = refreshFiltersArray(&config.WhitelistFilters, force)
</s> add updateCountW, updateFiltersW, updateFlagsW, netErrorW = f.refreshFiltersArray(&config.WhitelistFilters, force) </s> remove ok, err := f.update()
</s> add ok, err := f.update(&filt) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
<mask> nfail++
<mask> log.Printf("Failed to update filter %s: %s\n", uf.URL, err)
<mask> continue
<mask> }
<mask> uf.LastUpdated = now
<mask> }
<mask>
<mask> if nfail == len(updateFilters) {
<mask> return 0, nil, nil, true
<mask> }
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove updated, err := uf.update()
</s> add updated, err := f.update(uf) </s> remove m := filterTitleRegexp.FindAllStringSubmatch(line, -1)
</s> add m := f.filterTitleRegexp.FindAllStringSubmatch(line, -1) </s> remove ok, err := f.update()
assert.True(t, ok && err == nil)
</s> add ok, err := Context.filters.update(&f)
assert.Equal(t, nil, err)
assert.True(t, ok) </s> remove ok, err := f.update()
</s> add ok, err := f.update(&filt) </s> remove if updated {
err := uf.saveAndBackupOld()
if err != nil {
log.Printf("Failed to save the updated filter %d: %s", uf.ID, err)
continue
}
} else {
e := os.Chtimes(uf.Path(), uf.LastUpdated, uf.LastUpdated)
if e != nil {
log.Error("os.Chtimes(): %v", e)
}
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
|
<mask> updateCount := 0
<mask> for i := range updateFilters {
<mask> uf := &updateFilters[i]
<mask> updated := updateFlags[i]
<mask> if updated {
<mask> err := uf.saveAndBackupOld()
<mask> if err != nil {
<mask> log.Printf("Failed to save the updated filter %d: %s", uf.ID, err)
<mask> continue
<mask> }
<mask> } else {
<mask> e := os.Chtimes(uf.Path(), uf.LastUpdated, uf.LastUpdated)
<mask> if e != nil {
<mask> log.Error("os.Chtimes(): %v", e)
<mask> }
<mask> }
<mask>
<mask> config.Lock()
<mask> for k := range *filters {
<mask> f := &(*filters)[k]
<mask> if f.ID != uf.ID || f.URL != uf.URL {
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove updated, err := uf.update()
</s> add updated, err := f.update(uf) </s> remove f := &(*filters)[i]
if f.URL != url {
</s> add filt := &(*filters)[i]
if filt.URL != url { </s> remove return rulesCount, name
</s> add return rulesCount, checksum, name
}
// Perform upgrade on a filter and update LastUpdated value
func (f *Filtering) update(filter *filter) (bool, error) {
b, err := f.updateIntl(filter)
filter.LastUpdated = time.Now()
if !b {
e := os.Chtimes(filter.Path(), filter.LastUpdated, filter.LastUpdated)
if e != nil {
log.Error("os.Chtimes(): %v", e)
}
}
return b, err </s> remove body, err := ioutil.ReadAll(resp.Body)
if err != nil {
log.Printf("Couldn't fetch filter contents from URL %s, skipping: %s", filter.URL, err)
return false, err
</s> add htmlTest := true
firstChunk := make([]byte, 4*1024)
firstChunkLen := 0
buf := make([]byte, 64*1024)
total := 0
for {
n, err := resp.Body.Read(buf)
total += n
if htmlTest {
// gather full buffer firstChunk and perform its data tests
num := util.MinInt(n, len(firstChunk)-firstChunkLen)
copied := copy(firstChunk[firstChunkLen:], buf[:num])
firstChunkLen += copied
if firstChunkLen == len(firstChunk) || err == io.EOF {
if !isPrintableText(firstChunk) {
return false, fmt.Errorf("Data contains non-printable characters")
}
s := strings.ToLower(string(firstChunk))
if strings.Index(s, "<html") >= 0 ||
strings.Index(s, "<!doctype") >= 0 {
return false, fmt.Errorf("Data is HTML, not plain text")
}
htmlTest = false
firstChunk = nil
}
}
_, err2 := tmpfile.Write(buf[:n])
if err2 != nil {
return false, err2
}
if err == io.EOF {
break
}
if err != nil {
log.Printf("Couldn't fetch filter contents from URL %s, skipping: %s", filter.URL, err)
return false, err
} </s> remove func loadFilters(array []filter) {
</s> add func (f *Filtering) loadFilters(array []filter) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
|
<mask>
<mask> log.Info("Updated filter #%d. Rules: %d -> %d",
<mask> f.ID, f.RulesCount, uf.RulesCount)
<mask> f.Name = uf.Name
<mask> f.Data = nil
<mask> f.RulesCount = uf.RulesCount
<mask> f.checksum = uf.checksum
<mask> updateCount++
<mask> }
<mask> config.Unlock()
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove f.URL = newf.URL
f.unload()
f.LastUpdated = time.Time{}
f.checksum = 0
f.RulesCount = 0
</s> add filt.URL = newf.URL
filt.unload()
filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0 </s> remove f.LastUpdated = time.Time{}
f.checksum = 0
f.RulesCount = 0
</s> add filt.LastUpdated = time.Time{}
filt.checksum = 0
filt.RulesCount = 0 </s> remove if f.Enabled != newf.Enabled {
</s> add if filt.Enabled != newf.Enabled { </s> remove filter.Data = nil
filter.checksum = crc32.ChecksumIEEE(filterFileContents)
</s> add filter.checksum = checksum </s> remove log.Tracef("File %s, id %d, length %d", filterFilePath, filter.ID, len(filterFileContents))
rulesCount, _ := parseFilterContents(filterFileContents)
</s> add log.Tracef("File %s, id %d, length %d",
filterFilePath, filter.ID, st.Size())
rulesCount, checksum, _ := f.parseFilterContents(file) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
|
// . Store downloaded data in a temporary file inside data/filters directory | <mask> // Algorithm:
<mask> // . Get the list of filters to be updated
<mask> // . For each filter run the download and checksum check operation
<mask> // . For each filter:
<mask> // . If filter data hasn't changed, just set new update time on file
<mask> // . If filter data has changed:
<mask> // . rename the temporary file (<temp> -> 1.txt)
<mask> // Note that this method works only on UNIX.
<mask> // On Windows we don't pass files to dnsfilter - we pass the whole data.
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove // . rename the old file (1.txt -> 1.txt.old)
// . store the new data on disk (1.txt)
</s> add // . rename the temporary file (<temp> -> 1.txt)
// Note that this method works only on UNIX.
// On Windows we don't pass files to dnsfilter - we pass the whole data. </s> remove // . Remove the old filter files (1.txt.old)
</s> add </s> remove func refreshFiltersIfNecessary(flags int) (int, bool) {
</s> add func (f *Filtering) refreshFiltersIfNecessary(flags int) (int, bool) { </s> remove
return true, nil
}
// saves filter contents to the file in dataDir
// This method is safe to call during filters update,
// because it creates a new file and then renames it,
// so the currently opened file descriptors to the old filter file remain valid.
func (filter *filter) save() error {
</s> add </s> remove func startFiltering() {
</s> add // Start - start the module
func (f *Filtering) Start() {
f.RegisterFilteringHandlers()
| [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
// . rename the temporary file (<temp> -> 1.txt)
// Note that this method works only on UNIX.
// On Windows we don't pass files to dnsfilter - we pass the whole data. | <mask> // . For each filter run the download and checksum check operation
<mask> // . For each filter:
<mask> // . If filter data hasn't changed, just set new update time on file
<mask> // . If filter data has changed:
<mask> // . rename the old file (1.txt -> 1.txt.old)
<mask> // . store the new data on disk (1.txt)
<mask> // . Pass new filters to dnsfilter object - it analyzes new data while the old filters are still active
<mask> // . dnsfilter activates new filters
<mask> // . Remove the old filter files (1.txt.old)
<mask> //
<mask> // Return the number of updated filters
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove // . Remove the old filter files (1.txt.old)
</s> add </s> remove func refreshFiltersIfNecessary(flags int) (int, bool) {
</s> add func (f *Filtering) refreshFiltersIfNecessary(flags int) (int, bool) { </s> remove
return true, nil
}
// saves filter contents to the file in dataDir
// This method is safe to call during filters update,
// because it creates a new file and then renames it,
// so the currently opened file descriptors to the old filter file remain valid.
func (filter *filter) save() error {
</s> add </s> remove func loadFilters(array []filter) {
</s> add func (f *Filtering) loadFilters(array []filter) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
<mask> // . rename the old file (1.txt -> 1.txt.old)
<mask> // . store the new data on disk (1.txt)
<mask> // . Pass new filters to dnsfilter object - it analyzes new data while the old filters are still active
<mask> // . dnsfilter activates new filters
<mask> // . Remove the old filter files (1.txt.old)
<mask> //
<mask> // Return the number of updated filters
<mask> // Return TRUE - there was a network error and nothing could be updated
<mask> func refreshFiltersIfNecessary(flags int) (int, bool) {
<mask> log.Debug("Filters: updating...")
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove // . rename the old file (1.txt -> 1.txt.old)
// . store the new data on disk (1.txt)
</s> add // . rename the temporary file (<temp> -> 1.txt)
// Note that this method works only on UNIX.
// On Windows we don't pass files to dnsfilter - we pass the whole data. </s> remove func refreshFiltersIfNecessary(flags int) (int, bool) {
</s> add func (f *Filtering) refreshFiltersIfNecessary(flags int) (int, bool) { </s> remove
return true, nil
}
// saves filter contents to the file in dataDir
// This method is safe to call during filters update,
// because it creates a new file and then renames it,
// so the currently opened file descriptors to the old filter file remain valid.
func (filter *filter) save() error {
</s> add </s> remove func loadFilters(array []filter) {
</s> add func (f *Filtering) loadFilters(array []filter) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
|
func (f *Filtering) refreshFiltersIfNecessary(flags int) (int, bool) { | <mask> // . Remove the old filter files (1.txt.old)
<mask> //
<mask> // Return the number of updated filters
<mask> // Return TRUE - there was a network error and nothing could be updated
<mask> func refreshFiltersIfNecessary(flags int) (int, bool) {
<mask> log.Debug("Filters: updating...")
<mask>
<mask> updateCount := 0
<mask> var updateFilters []filter
<mask> var updateFlags []bool
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove // . Remove the old filter files (1.txt.old)
</s> add </s> remove // . rename the old file (1.txt -> 1.txt.old)
// . store the new data on disk (1.txt)
</s> add // . rename the temporary file (<temp> -> 1.txt)
// Note that this method works only on UNIX.
// On Windows we don't pass files to dnsfilter - we pass the whole data. </s> remove func refreshFiltersArray(filters *[]filter, force bool) (int, []filter, []bool, bool) {
</s> add func (f *Filtering) refreshFiltersArray(filters *[]filter, force bool) (int, []filter, []bool, bool) { </s> remove updateCountW, updateFiltersW, updateFlagsW, netErrorW = refreshFiltersArray(&config.WhitelistFilters, force)
</s> add updateCountW, updateFiltersW, updateFlagsW, netErrorW = f.refreshFiltersArray(&config.WhitelistFilters, force) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
updateCount, updateFilters, updateFlags, netError = f.refreshFiltersArray(&config.Filters, force) | <mask> if (flags & FilterRefreshForce) != 0 {
<mask> force = true
<mask> }
<mask> if (flags & FilterRefreshBlocklists) != 0 {
<mask> updateCount, updateFilters, updateFlags, netError = refreshFiltersArray(&config.Filters, force)
<mask> }
<mask> if (flags & FilterRefreshAllowlists) != 0 {
<mask> updateCountW := 0
<mask> var updateFiltersW []filter
<mask> var updateFlagsW []bool
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove updateCountW, updateFiltersW, updateFlagsW, netErrorW = refreshFiltersArray(&config.WhitelistFilters, force)
</s> add updateCountW, updateFiltersW, updateFlagsW, netErrorW = f.refreshFiltersArray(&config.WhitelistFilters, force) </s> remove if f.Enabled != newf.Enabled {
</s> add if filt.Enabled != newf.Enabled { </s> remove func refreshFiltersArray(filters *[]filter, force bool) (int, []filter, []bool, bool) {
</s> add func (f *Filtering) refreshFiltersArray(filters *[]filter, force bool) (int, []filter, []bool, bool) { </s> remove status := filterSetProperties(fj.URL, f, fj.Whitelist)
</s> add status := f.filterSetProperties(fj.URL, filt, fj.Whitelist) </s> remove refreshLock.Lock()
nUpdated, _ := refreshFiltersIfNecessary(flags)
refreshLock.Unlock()
refreshStatus = 0
</s> add f.refreshLock.Lock()
nUpdated, _ := f.refreshFiltersIfNecessary(flags)
f.refreshLock.Unlock()
f.refreshStatus = 0 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
updateCountW, updateFiltersW, updateFlagsW, netErrorW = f.refreshFiltersArray(&config.WhitelistFilters, force) | <mask> if (flags & FilterRefreshAllowlists) != 0 {
<mask> updateCountW := 0
<mask> var updateFiltersW []filter
<mask> var updateFlagsW []bool
<mask> updateCountW, updateFiltersW, updateFlagsW, netErrorW = refreshFiltersArray(&config.WhitelistFilters, force)
<mask> updateCount += updateCountW
<mask> updateFilters = append(updateFilters, updateFiltersW...)
<mask> updateFlags = append(updateFlags, updateFlagsW...)
<mask> }
<mask> if netError && netErrorW {
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove updateCount, updateFilters, updateFlags, netError = refreshFiltersArray(&config.Filters, force)
</s> add updateCount, updateFilters, updateFlags, netError = f.refreshFiltersArray(&config.Filters, force) </s> remove func refreshFiltersArray(filters *[]filter, force bool) (int, []filter, []bool, bool) {
</s> add func (f *Filtering) refreshFiltersArray(filters *[]filter, force bool) (int, []filter, []bool, bool) { </s> remove func refreshFiltersIfNecessary(flags int) (int, bool) {
</s> add func (f *Filtering) refreshFiltersIfNecessary(flags int) (int, bool) { </s> remove refreshLock.Lock()
nUpdated, _ := refreshFiltersIfNecessary(flags)
refreshLock.Unlock()
refreshStatus = 0
</s> add f.refreshLock.Lock()
nUpdated, _ := f.refreshFiltersIfNecessary(flags)
f.refreshLock.Unlock()
f.refreshStatus = 0 </s> remove if config.DNS.FiltersUpdateIntervalHours != 0 && atomic.CompareAndSwapUint32(&refreshStatus, 0, 1) {
refreshLock.Lock()
_, isNetworkErr = refreshFiltersIfNecessary(FilterRefreshBlocklists | FilterRefreshAllowlists)
refreshLock.Unlock()
refreshStatus = 0
</s> add if config.DNS.FiltersUpdateIntervalHours != 0 && atomic.CompareAndSwapUint32(&f.refreshStatus, 0, 1) {
f.refreshLock.Lock()
_, isNetworkErr = f.refreshFiltersIfNecessary(FilterRefreshBlocklists | FilterRefreshAllowlists)
f.refreshLock.Unlock()
f.refreshStatus = 0 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
func (f *Filtering) parseFilterContents(file io.Reader) (int, uint32, string) { | <mask> return true
<mask> }
<mask>
<mask> // A helper function that parses filter contents and returns a number of rules and a filter name (if there's any)
<mask> func parseFilterContents(contents []byte) (int, string) {
<mask> data := string(contents)
<mask> rulesCount := 0
<mask> name := ""
<mask> seenTitle := false
<mask>
<mask> // Count lines in the filter
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove // Count lines in the filter
for len(data) != 0 {
line := util.SplitNext(&data, '\n')
</s> add checksum = crc32.Update(checksum, crc32.IEEETable, []byte(line))
line = strings.TrimSpace(line) </s> remove func refreshFiltersIfNecessary(flags int) (int, bool) {
</s> add func (f *Filtering) refreshFiltersIfNecessary(flags int) (int, bool) { </s> remove return rulesCount, name
</s> add return rulesCount, checksum, name
}
// Perform upgrade on a filter and update LastUpdated value
func (f *Filtering) update(filter *filter) (bool, error) {
b, err := f.updateIntl(filter)
filter.LastUpdated = time.Now()
if !b {
e := os.Chtimes(filter.Path(), filter.LastUpdated, filter.LastUpdated)
if e != nil {
log.Error("os.Chtimes(): %v", e)
}
}
return b, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
r := bufio.NewReader(file)
checksum := uint32(0)
for {
line, err := r.ReadString('\n')
if err != nil {
break
} | <mask> name := ""
<mask> seenTitle := false
<mask>
<mask> checksum = crc32.Update(checksum, crc32.IEEETable, []byte(line))
<mask>
<mask> line = strings.TrimSpace(line)
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove // Count lines in the filter
for len(data) != 0 {
line := util.SplitNext(&data, '\n')
</s> add checksum = crc32.Update(checksum, crc32.IEEETable, []byte(line))
line = strings.TrimSpace(line) </s> remove func parseFilterContents(contents []byte) (int, string) {
data := string(contents)
</s> add func (f *Filtering) parseFilterContents(file io.Reader) (int, uint32, string) { </s> remove m := filterTitleRegexp.FindAllStringSubmatch(line, -1)
</s> add m := f.filterTitleRegexp.FindAllStringSubmatch(line, -1) </s> remove filter.Data = body
</s> add </s> remove filter.Data = nil
filter.checksum = crc32.ChecksumIEEE(filterFileContents)
</s> add filter.checksum = checksum | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
checksum = crc32.Update(checksum, crc32.IEEETable, []byte(line))
line = strings.TrimSpace(line) | <mask> rulesCount := 0
<mask> name := ""
<mask> seenTitle := false
<mask>
<mask> // Count lines in the filter
<mask> for len(data) != 0 {
<mask> line := util.SplitNext(&data, '\n')
<mask> if len(line) == 0 {
<mask> continue
<mask> }
<mask>
<mask> if line[0] == '!' {
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove m := filterTitleRegexp.FindAllStringSubmatch(line, -1)
</s> add m := f.filterTitleRegexp.FindAllStringSubmatch(line, -1) </s> remove func parseFilterContents(contents []byte) (int, string) {
data := string(contents)
</s> add func (f *Filtering) parseFilterContents(file io.Reader) (int, uint32, string) { </s> remove body, err := ioutil.ReadAll(resp.Body)
if err != nil {
log.Printf("Couldn't fetch filter contents from URL %s, skipping: %s", filter.URL, err)
return false, err
</s> add htmlTest := true
firstChunk := make([]byte, 4*1024)
firstChunkLen := 0
buf := make([]byte, 64*1024)
total := 0
for {
n, err := resp.Body.Read(buf)
total += n
if htmlTest {
// gather full buffer firstChunk and perform its data tests
num := util.MinInt(n, len(firstChunk)-firstChunkLen)
copied := copy(firstChunk[firstChunkLen:], buf[:num])
firstChunkLen += copied
if firstChunkLen == len(firstChunk) || err == io.EOF {
if !isPrintableText(firstChunk) {
return false, fmt.Errorf("Data contains non-printable characters")
}
s := strings.ToLower(string(firstChunk))
if strings.Index(s, "<html") >= 0 ||
strings.Index(s, "<!doctype") >= 0 {
return false, fmt.Errorf("Data is HTML, not plain text")
}
htmlTest = false
firstChunk = nil
}
}
_, err2 := tmpfile.Write(buf[:n])
if err2 != nil {
return false, err2
}
if err == io.EOF {
break
}
if err != nil {
log.Printf("Couldn't fetch filter contents from URL %s, skipping: %s", filter.URL, err)
return false, err
} </s> remove if updated {
err := uf.saveAndBackupOld()
if err != nil {
log.Printf("Failed to save the updated filter %d: %s", uf.ID, err)
continue
}
} else {
e := os.Chtimes(uf.Path(), uf.LastUpdated, uf.LastUpdated)
if e != nil {
log.Error("os.Chtimes(): %v", e)
}
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
m := f.filterTitleRegexp.FindAllStringSubmatch(line, -1) | <mask> continue
<mask> }
<mask>
<mask> if line[0] == '!' {
<mask> m := filterTitleRegexp.FindAllStringSubmatch(line, -1)
<mask> if len(m) > 0 && len(m[0]) >= 2 && !seenTitle {
<mask> name = m[0][1]
<mask> seenTitle = true
<mask> }
<mask> } else {
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove // Count lines in the filter
for len(data) != 0 {
line := util.SplitNext(&data, '\n')
</s> add checksum = crc32.Update(checksum, crc32.IEEETable, []byte(line))
line = strings.TrimSpace(line) </s> remove var firstChunk []byte
if len(body) <= 4096 {
firstChunk = body
} else {
firstChunk = body[:4096]
}
if !isPrintableText(firstChunk) {
return false, fmt.Errorf("Data contains non-printable characters")
}
s := strings.ToLower(string(firstChunk))
if strings.Index(s, "<html") >= 0 ||
strings.Index(s, "<!doctype") >= 0 {
return false, fmt.Errorf("Data is HTML, not plain text")
}
// Extract filter name and count number of rules
rulesCount, filterName := parseFilterContents(body)
log.Printf("Filter %d has been updated: %d bytes, %d rules", filter.ID, len(body), rulesCount)
</s> add log.Printf("Filter %d has been updated: %d bytes, %d rules",
filter.ID, total, rulesCount) </s> remove uf.LastUpdated = now
</s> add </s> remove if config.DNS.FiltersUpdateIntervalHours != 0 && atomic.CompareAndSwapUint32(&refreshStatus, 0, 1) {
refreshLock.Lock()
_, isNetworkErr = refreshFiltersIfNecessary(FilterRefreshBlocklists | FilterRefreshAllowlists)
refreshLock.Unlock()
refreshStatus = 0
</s> add if config.DNS.FiltersUpdateIntervalHours != 0 && atomic.CompareAndSwapUint32(&f.refreshStatus, 0, 1) {
f.refreshLock.Lock()
_, isNetworkErr = f.refreshFiltersIfNecessary(FilterRefreshBlocklists | FilterRefreshAllowlists)
f.refreshLock.Unlock()
f.refreshStatus = 0 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
return rulesCount, checksum, name
}
// Perform upgrade on a filter and update LastUpdated value
func (f *Filtering) update(filter *filter) (bool, error) {
b, err := f.updateIntl(filter)
filter.LastUpdated = time.Now()
if !b {
e := os.Chtimes(filter.Path(), filter.LastUpdated, filter.LastUpdated)
if e != nil {
log.Error("os.Chtimes(): %v", e)
}
}
return b, err | <mask> rulesCount++
<mask> }
<mask> }
<mask>
<mask> return rulesCount, name
<mask> }
<mask>
<mask> // Perform upgrade on a filter
<mask> func (filter *filter) update() (bool, error) {
<mask> log.Tracef("Downloading update for filter %d from %s", filter.ID, filter.URL)
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove // Perform upgrade on a filter
func (filter *filter) update() (bool, error) {
</s> add func (f *Filtering) updateIntl(filter *filter) (bool, error) { </s> remove func (filter *filter) load() error {
</s> add func (f *Filtering) load(filter *filter) error { </s> remove
err := file.SafeWrite(filterFilePath, filter.Data)
// update LastUpdated field after saving the file
filter.LastUpdated = filter.LastTimeUpdated()
return err
}
func (filter *filter) saveAndBackupOld() error {
filterFilePath := filter.Path()
err := os.Rename(filterFilePath, filterFilePath+".old")
if err != nil && !os.IsNotExist(err) {
return err
</s> add err = os.Rename(tmpfile.Name(), filterFilePath)
if err != nil {
return false, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
func (f *Filtering) updateIntl(filter *filter) (bool, error) { | <mask>
<mask> return rulesCount, name
<mask> }
<mask>
<mask> // Perform upgrade on a filter
<mask> func (filter *filter) update() (bool, error) {
<mask> log.Tracef("Downloading update for filter %d from %s", filter.ID, filter.URL)
<mask>
<mask> resp, err := Context.client.Get(filter.URL)
<mask> if resp != nil && resp.Body != nil {
<mask> defer resp.Body.Close()
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove return rulesCount, name
</s> add return rulesCount, checksum, name
}
// Perform upgrade on a filter and update LastUpdated value
func (f *Filtering) update(filter *filter) (bool, error) {
b, err := f.updateIntl(filter)
filter.LastUpdated = time.Now()
if !b {
e := os.Chtimes(filter.Path(), filter.LastUpdated, filter.LastUpdated)
if e != nil {
log.Error("os.Chtimes(): %v", e)
}
}
return b, err </s> remove
err := file.SafeWrite(filterFilePath, filter.Data)
// update LastUpdated field after saving the file
filter.LastUpdated = filter.LastTimeUpdated()
return err
}
func (filter *filter) saveAndBackupOld() error {
filterFilePath := filter.Path()
err := os.Rename(filterFilePath, filterFilePath+".old")
if err != nil && !os.IsNotExist(err) {
return err
</s> add err = os.Rename(tmpfile.Name(), filterFilePath)
if err != nil {
return false, err </s> remove func (filter *filter) load() error {
</s> add func (f *Filtering) load(filter *filter) error { </s> remove return filter.save()
</s> add tmpfile.Close()
tmpfile = nil
return true, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
tmpfile, err := ioutil.TempFile(filepath.Join(Context.getDataDir(), filterDir), "")
if err != nil {
return false, err
}
defer func() {
if tmpfile != nil {
_ = tmpfile.Close()
_ = os.Remove(tmpfile.Name())
}
}()
| <mask> func (f *Filtering) updateIntl(filter *filter) (bool, error) {
<mask> log.Tracef("Downloading update for filter %d from %s", filter.ID, filter.URL)
<mask>
<mask> resp, err := Context.client.Get(filter.URL)
<mask> if resp != nil && resp.Body != nil {
<mask> defer resp.Body.Close()
<mask> }
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove // Perform upgrade on a filter
func (filter *filter) update() (bool, error) {
</s> add func (f *Filtering) updateIntl(filter *filter) (bool, error) { </s> remove return rulesCount, name
</s> add return rulesCount, checksum, name
}
// Perform upgrade on a filter and update LastUpdated value
func (f *Filtering) update(filter *filter) (bool, error) {
b, err := f.updateIntl(filter)
filter.LastUpdated = time.Now()
if !b {
e := os.Chtimes(filter.Path(), filter.LastUpdated, filter.LastUpdated)
if e != nil {
log.Error("os.Chtimes(): %v", e)
}
}
return b, err </s> remove func (filter *filter) load() error {
</s> add func (f *Filtering) load(filter *filter) error { </s> remove
err := file.SafeWrite(filterFilePath, filter.Data)
// update LastUpdated field after saving the file
filter.LastUpdated = filter.LastTimeUpdated()
return err
}
func (filter *filter) saveAndBackupOld() error {
filterFilePath := filter.Path()
err := os.Rename(filterFilePath, filterFilePath+".old")
if err != nil && !os.IsNotExist(err) {
return err
</s> add err = os.Rename(tmpfile.Name(), filterFilePath)
if err != nil {
return false, err </s> remove return filter.save()
</s> add tmpfile.Close()
tmpfile = nil
return true, nil | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
htmlTest := true
firstChunk := make([]byte, 4*1024)
firstChunkLen := 0
buf := make([]byte, 64*1024)
total := 0
for {
n, err := resp.Body.Read(buf)
total += n
if htmlTest {
// gather full buffer firstChunk and perform its data tests
num := util.MinInt(n, len(firstChunk)-firstChunkLen)
copied := copy(firstChunk[firstChunkLen:], buf[:num])
firstChunkLen += copied
if firstChunkLen == len(firstChunk) || err == io.EOF {
if !isPrintableText(firstChunk) {
return false, fmt.Errorf("Data contains non-printable characters")
}
s := strings.ToLower(string(firstChunk))
if strings.Index(s, "<html") >= 0 ||
strings.Index(s, "<!doctype") >= 0 {
return false, fmt.Errorf("Data is HTML, not plain text")
}
htmlTest = false
firstChunk = nil
}
}
_, err2 := tmpfile.Write(buf[:n])
if err2 != nil {
return false, err2
}
if err == io.EOF {
break
}
if err != nil {
log.Printf("Couldn't fetch filter contents from URL %s, skipping: %s", filter.URL, err)
return false, err
} | <mask> log.Printf("Got status code %d from URL %s, skipping", resp.StatusCode, filter.URL)
<mask> return false, fmt.Errorf("got status code != 200: %d", resp.StatusCode)
<mask> }
<mask>
<mask> body, err := ioutil.ReadAll(resp.Body)
<mask> if err != nil {
<mask> log.Printf("Couldn't fetch filter contents from URL %s, skipping: %s", filter.URL, err)
<mask> return false, err
<mask> }
<mask>
<mask> // Check if the filter has been really changed
<mask> checksum := crc32.ChecksumIEEE(body)
<mask> if filter.checksum == checksum {
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove checksum := crc32.ChecksumIEEE(body)
</s> add </s> remove ok, err := f.update()
</s> add ok, err := f.update(&filt) </s> remove var firstChunk []byte
if len(body) <= 4096 {
firstChunk = body
} else {
firstChunk = body[:4096]
}
if !isPrintableText(firstChunk) {
return false, fmt.Errorf("Data contains non-printable characters")
}
s := strings.ToLower(string(firstChunk))
if strings.Index(s, "<html") >= 0 ||
strings.Index(s, "<!doctype") >= 0 {
return false, fmt.Errorf("Data is HTML, not plain text")
}
// Extract filter name and count number of rules
rulesCount, filterName := parseFilterContents(body)
log.Printf("Filter %d has been updated: %d bytes, %d rules", filter.ID, len(body), rulesCount)
</s> add log.Printf("Filter %d has been updated: %d bytes, %d rules",
filter.ID, total, rulesCount) </s> remove httpError(w, http.StatusBadRequest, "Couldn't fetch filter from url %s: %s", f.URL, err)
return
}
if f.RulesCount == 0 {
httpError(w, http.StatusBadRequest, "Filter at the url %s has no rules (maybe it points to blank page?)", f.URL)
</s> add httpError(w, http.StatusBadRequest, "Couldn't fetch filter from url %s: %s", filt.URL, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
// Extract filter name and count number of rules
_, _ = tmpfile.Seek(0, io.SeekStart)
rulesCount, checksum, filterName := f.parseFilterContents(tmpfile) | <mask> }
<mask> }
<mask>
<mask> // Check if the filter has been really changed
<mask> if filter.checksum == checksum {
<mask> log.Tracef("Filter #%d at URL %s hasn't changed, not updating it", filter.ID, filter.URL)
<mask> return false, nil
<mask> }
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove checksum := crc32.ChecksumIEEE(body)
</s> add </s> remove var firstChunk []byte
if len(body) <= 4096 {
firstChunk = body
} else {
firstChunk = body[:4096]
}
if !isPrintableText(firstChunk) {
return false, fmt.Errorf("Data contains non-printable characters")
}
s := strings.ToLower(string(firstChunk))
if strings.Index(s, "<html") >= 0 ||
strings.Index(s, "<!doctype") >= 0 {
return false, fmt.Errorf("Data is HTML, not plain text")
}
// Extract filter name and count number of rules
rulesCount, filterName := parseFilterContents(body)
log.Printf("Filter %d has been updated: %d bytes, %d rules", filter.ID, len(body), rulesCount)
</s> add log.Printf("Filter %d has been updated: %d bytes, %d rules",
filter.ID, total, rulesCount) </s> remove body, err := ioutil.ReadAll(resp.Body)
if err != nil {
log.Printf("Couldn't fetch filter contents from URL %s, skipping: %s", filter.URL, err)
return false, err
</s> add htmlTest := true
firstChunk := make([]byte, 4*1024)
firstChunkLen := 0
buf := make([]byte, 64*1024)
total := 0
for {
n, err := resp.Body.Read(buf)
total += n
if htmlTest {
// gather full buffer firstChunk and perform its data tests
num := util.MinInt(n, len(firstChunk)-firstChunkLen)
copied := copy(firstChunk[firstChunkLen:], buf[:num])
firstChunkLen += copied
if firstChunkLen == len(firstChunk) || err == io.EOF {
if !isPrintableText(firstChunk) {
return false, fmt.Errorf("Data contains non-printable characters")
}
s := strings.ToLower(string(firstChunk))
if strings.Index(s, "<html") >= 0 ||
strings.Index(s, "<!doctype") >= 0 {
return false, fmt.Errorf("Data is HTML, not plain text")
}
htmlTest = false
firstChunk = nil
}
}
_, err2 := tmpfile.Write(buf[:n])
if err2 != nil {
return false, err2
}
if err == io.EOF {
break
}
if err != nil {
log.Printf("Couldn't fetch filter contents from URL %s, skipping: %s", filter.URL, err)
return false, err
} </s> remove nUpdated, _ := refreshFilters(flags, true)
</s> add nUpdated, _ := f.refreshFilters(flags, true) </s> remove httpError(w, http.StatusBadRequest, "Filter at the url %s is invalid (maybe it points to blank page?)", f.URL)
return
}
// Save the filter contents
err = f.save()
if err != nil {
httpError(w, http.StatusBadRequest, "Failed to save filter %d due to %s", f.ID, err)
</s> add httpError(w, http.StatusBadRequest, "Filter at the url %s is invalid (maybe it points to blank page?)", filt.URL) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
<mask> return false, err
<mask> }
<mask>
<mask> // Check if the filter has been really changed
<mask> checksum := crc32.ChecksumIEEE(body)
<mask> if filter.checksum == checksum {
<mask> log.Tracef("Filter #%d at URL %s hasn't changed, not updating it", filter.ID, filter.URL)
<mask> return false, nil
<mask> }
<mask>
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove var firstChunk []byte
if len(body) <= 4096 {
firstChunk = body
} else {
firstChunk = body[:4096]
}
if !isPrintableText(firstChunk) {
return false, fmt.Errorf("Data contains non-printable characters")
}
s := strings.ToLower(string(firstChunk))
if strings.Index(s, "<html") >= 0 ||
strings.Index(s, "<!doctype") >= 0 {
return false, fmt.Errorf("Data is HTML, not plain text")
}
// Extract filter name and count number of rules
rulesCount, filterName := parseFilterContents(body)
log.Printf("Filter %d has been updated: %d bytes, %d rules", filter.ID, len(body), rulesCount)
</s> add log.Printf("Filter %d has been updated: %d bytes, %d rules",
filter.ID, total, rulesCount) </s> remove body, err := ioutil.ReadAll(resp.Body)
if err != nil {
log.Printf("Couldn't fetch filter contents from URL %s, skipping: %s", filter.URL, err)
return false, err
</s> add htmlTest := true
firstChunk := make([]byte, 4*1024)
firstChunkLen := 0
buf := make([]byte, 64*1024)
total := 0
for {
n, err := resp.Body.Read(buf)
total += n
if htmlTest {
// gather full buffer firstChunk and perform its data tests
num := util.MinInt(n, len(firstChunk)-firstChunkLen)
copied := copy(firstChunk[firstChunkLen:], buf[:num])
firstChunkLen += copied
if firstChunkLen == len(firstChunk) || err == io.EOF {
if !isPrintableText(firstChunk) {
return false, fmt.Errorf("Data contains non-printable characters")
}
s := strings.ToLower(string(firstChunk))
if strings.Index(s, "<html") >= 0 ||
strings.Index(s, "<!doctype") >= 0 {
return false, fmt.Errorf("Data is HTML, not plain text")
}
htmlTest = false
firstChunk = nil
}
}
_, err2 := tmpfile.Write(buf[:n])
if err2 != nil {
return false, err2
}
if err == io.EOF {
break
}
if err != nil {
log.Printf("Couldn't fetch filter contents from URL %s, skipping: %s", filter.URL, err)
return false, err
} </s> remove nUpdated, _ := refreshFilters(flags, true)
</s> add nUpdated, _ := f.refreshFilters(flags, true) </s> remove httpError(w, http.StatusBadRequest, "Couldn't fetch filter from url %s: %s", f.URL, err)
return
}
if f.RulesCount == 0 {
httpError(w, http.StatusBadRequest, "Filter at the url %s has no rules (maybe it points to blank page?)", f.URL)
</s> add httpError(w, http.StatusBadRequest, "Couldn't fetch filter from url %s: %s", filt.URL, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
|
log.Printf("Filter %d has been updated: %d bytes, %d rules",
filter.ID, total, rulesCount) | <mask> log.Tracef("Filter #%d at URL %s hasn't changed, not updating it", filter.ID, filter.URL)
<mask> return false, nil
<mask> }
<mask>
<mask> var firstChunk []byte
<mask> if len(body) <= 4096 {
<mask> firstChunk = body
<mask> } else {
<mask> firstChunk = body[:4096]
<mask> }
<mask> if !isPrintableText(firstChunk) {
<mask> return false, fmt.Errorf("Data contains non-printable characters")
<mask> }
<mask>
<mask> s := strings.ToLower(string(firstChunk))
<mask> if strings.Index(s, "<html") >= 0 ||
<mask> strings.Index(s, "<!doctype") >= 0 {
<mask> return false, fmt.Errorf("Data is HTML, not plain text")
<mask> }
<mask>
<mask> // Extract filter name and count number of rules
<mask> rulesCount, filterName := parseFilterContents(body)
<mask> log.Printf("Filter %d has been updated: %d bytes, %d rules", filter.ID, len(body), rulesCount)
<mask> if filterName != "" {
<mask> filter.Name = filterName
<mask> }
<mask> filter.RulesCount = rulesCount
<mask> filter.Data = body
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove body, err := ioutil.ReadAll(resp.Body)
if err != nil {
log.Printf("Couldn't fetch filter contents from URL %s, skipping: %s", filter.URL, err)
return false, err
</s> add htmlTest := true
firstChunk := make([]byte, 4*1024)
firstChunkLen := 0
buf := make([]byte, 64*1024)
total := 0
for {
n, err := resp.Body.Read(buf)
total += n
if htmlTest {
// gather full buffer firstChunk and perform its data tests
num := util.MinInt(n, len(firstChunk)-firstChunkLen)
copied := copy(firstChunk[firstChunkLen:], buf[:num])
firstChunkLen += copied
if firstChunkLen == len(firstChunk) || err == io.EOF {
if !isPrintableText(firstChunk) {
return false, fmt.Errorf("Data contains non-printable characters")
}
s := strings.ToLower(string(firstChunk))
if strings.Index(s, "<html") >= 0 ||
strings.Index(s, "<!doctype") >= 0 {
return false, fmt.Errorf("Data is HTML, not plain text")
}
htmlTest = false
firstChunk = nil
}
}
_, err2 := tmpfile.Write(buf[:n])
if err2 != nil {
return false, err2
}
if err == io.EOF {
break
}
if err != nil {
log.Printf("Couldn't fetch filter contents from URL %s, skipping: %s", filter.URL, err)
return false, err
} </s> remove checksum := crc32.ChecksumIEEE(body)
</s> add </s> remove filter.Data = body
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
<mask> if filterName != "" {
<mask> filter.Name = filterName
<mask> }
<mask> filter.RulesCount = rulesCount
<mask> filter.Data = body
<mask> filter.checksum = checksum
<mask>
<mask> return true, nil
<mask> }
<mask>
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove var firstChunk []byte
if len(body) <= 4096 {
firstChunk = body
} else {
firstChunk = body[:4096]
}
if !isPrintableText(firstChunk) {
return false, fmt.Errorf("Data contains non-printable characters")
}
s := strings.ToLower(string(firstChunk))
if strings.Index(s, "<html") >= 0 ||
strings.Index(s, "<!doctype") >= 0 {
return false, fmt.Errorf("Data is HTML, not plain text")
}
// Extract filter name and count number of rules
rulesCount, filterName := parseFilterContents(body)
log.Printf("Filter %d has been updated: %d bytes, %d rules", filter.ID, len(body), rulesCount)
</s> add log.Printf("Filter %d has been updated: %d bytes, %d rules",
filter.ID, total, rulesCount) </s> remove filter.Data = nil
filter.checksum = crc32.ChecksumIEEE(filterFileContents)
</s> add filter.checksum = checksum </s> remove
return true, nil
}
// saves filter contents to the file in dataDir
// This method is safe to call during filters update,
// because it creates a new file and then renames it,
// so the currently opened file descriptors to the old filter file remain valid.
func (filter *filter) save() error {
</s> add </s> remove log.Tracef("File %s, id %d, length %d", filterFilePath, filter.ID, len(filterFileContents))
rulesCount, _ := parseFilterContents(filterFileContents)
</s> add log.Tracef("File %s, id %d, length %d",
filterFilePath, filter.ID, st.Size())
rulesCount, checksum, _ := f.parseFilterContents(file) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
|
<mask> }
<mask> filter.RulesCount = rulesCount
<mask> filter.Data = body
<mask> filter.checksum = checksum
<mask>
<mask> return true, nil
<mask> }
<mask>
<mask> // saves filter contents to the file in dataDir
<mask> // This method is safe to call during filters update,
<mask> // because it creates a new file and then renames it,
<mask> // so the currently opened file descriptors to the old filter file remain valid.
<mask> func (filter *filter) save() error {
<mask> filterFilePath := filter.Path()
<mask> log.Printf("Saving filter %d contents to: %s", filter.ID, filterFilePath)
<mask>
<mask> err := file.SafeWrite(filterFilePath, filter.Data)
<mask>
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove
err := file.SafeWrite(filterFilePath, filter.Data)
// update LastUpdated field after saving the file
filter.LastUpdated = filter.LastTimeUpdated()
return err
}
func (filter *filter) saveAndBackupOld() error {
filterFilePath := filter.Path()
err := os.Rename(filterFilePath, filterFilePath+".old")
if err != nil && !os.IsNotExist(err) {
return err
</s> add err = os.Rename(tmpfile.Name(), filterFilePath)
if err != nil {
return false, err </s> remove func (filter *filter) load() error {
</s> add func (f *Filtering) load(filter *filter) error { </s> remove return filter.save()
</s> add tmpfile.Close()
tmpfile = nil
return true, nil </s> remove filter.Data = nil
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
|
err = os.Rename(tmpfile.Name(), filterFilePath)
if err != nil {
return false, err | <mask> // so the currently opened file descriptors to the old filter file remain valid.
<mask> func (filter *filter) save() error {
<mask> filterFilePath := filter.Path()
<mask> log.Printf("Saving filter %d contents to: %s", filter.ID, filterFilePath)
<mask>
<mask> err := file.SafeWrite(filterFilePath, filter.Data)
<mask>
<mask> // update LastUpdated field after saving the file
<mask> filter.LastUpdated = filter.LastTimeUpdated()
<mask> return err
<mask> }
<mask>
<mask> func (filter *filter) saveAndBackupOld() error {
<mask> filterFilePath := filter.Path()
<mask> err := os.Rename(filterFilePath, filterFilePath+".old")
<mask> if err != nil && !os.IsNotExist(err) {
<mask> return err
<mask> }
<mask> return filter.save()
<mask> }
<mask>
<mask> // loads filter contents from the file in dataDir
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove
return true, nil
}
// saves filter contents to the file in dataDir
// This method is safe to call during filters update,
// because it creates a new file and then renames it,
// so the currently opened file descriptors to the old filter file remain valid.
func (filter *filter) save() error {
</s> add </s> remove return filter.save()
</s> add tmpfile.Close()
tmpfile = nil
return true, nil </s> remove func (filter *filter) load() error {
</s> add func (f *Filtering) load(filter *filter) error { </s> remove return rulesCount, name
</s> add return rulesCount, checksum, name
}
// Perform upgrade on a filter and update LastUpdated value
func (f *Filtering) update(filter *filter) (bool, error) {
b, err := f.updateIntl(filter)
filter.LastUpdated = time.Now()
if !b {
e := os.Chtimes(filter.Path(), filter.LastUpdated, filter.LastUpdated)
if e != nil {
log.Error("os.Chtimes(): %v", e)
}
}
return b, err </s> remove // Perform upgrade on a filter
func (filter *filter) update() (bool, error) {
</s> add func (f *Filtering) updateIntl(filter *filter) (bool, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
tmpfile.Close()
tmpfile = nil
return true, nil | <mask> err := os.Rename(filterFilePath, filterFilePath+".old")
<mask> if err != nil && !os.IsNotExist(err) {
<mask> return err
<mask> }
<mask> return filter.save()
<mask> }
<mask>
<mask> // loads filter contents from the file in dataDir
<mask> func (filter *filter) load() error {
<mask> filterFilePath := filter.Path()
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove
err := file.SafeWrite(filterFilePath, filter.Data)
// update LastUpdated field after saving the file
filter.LastUpdated = filter.LastTimeUpdated()
return err
}
func (filter *filter) saveAndBackupOld() error {
filterFilePath := filter.Path()
err := os.Rename(filterFilePath, filterFilePath+".old")
if err != nil && !os.IsNotExist(err) {
return err
</s> add err = os.Rename(tmpfile.Name(), filterFilePath)
if err != nil {
return false, err </s> remove func (filter *filter) load() error {
</s> add func (f *Filtering) load(filter *filter) error { </s> remove
return true, nil
}
// saves filter contents to the file in dataDir
// This method is safe to call during filters update,
// because it creates a new file and then renames it,
// so the currently opened file descriptors to the old filter file remain valid.
func (filter *filter) save() error {
</s> add </s> remove // Perform upgrade on a filter
func (filter *filter) update() (bool, error) {
</s> add func (f *Filtering) updateIntl(filter *filter) (bool, error) { </s> remove return rulesCount, name
</s> add return rulesCount, checksum, name
}
// Perform upgrade on a filter and update LastUpdated value
func (f *Filtering) update(filter *filter) (bool, error) {
b, err := f.updateIntl(filter)
filter.LastUpdated = time.Now()
if !b {
e := os.Chtimes(filter.Path(), filter.LastUpdated, filter.LastUpdated)
if e != nil {
log.Error("os.Chtimes(): %v", e)
}
}
return b, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
func (f *Filtering) load(filter *filter) error { | <mask> return filter.save()
<mask> }
<mask>
<mask> // loads filter contents from the file in dataDir
<mask> func (filter *filter) load() error {
<mask> filterFilePath := filter.Path()
<mask> log.Tracef("Loading filter %d contents to: %s", filter.ID, filterFilePath)
<mask>
<mask> if _, err := os.Stat(filterFilePath); os.IsNotExist(err) {
<mask> // do nothing, file doesn't exist
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove
err := file.SafeWrite(filterFilePath, filter.Data)
// update LastUpdated field after saving the file
filter.LastUpdated = filter.LastTimeUpdated()
return err
}
func (filter *filter) saveAndBackupOld() error {
filterFilePath := filter.Path()
err := os.Rename(filterFilePath, filterFilePath+".old")
if err != nil && !os.IsNotExist(err) {
return err
</s> add err = os.Rename(tmpfile.Name(), filterFilePath)
if err != nil {
return false, err </s> remove return filter.save()
</s> add tmpfile.Close()
tmpfile = nil
return true, nil </s> remove
return true, nil
}
// saves filter contents to the file in dataDir
// This method is safe to call during filters update,
// because it creates a new file and then renames it,
// so the currently opened file descriptors to the old filter file remain valid.
func (filter *filter) save() error {
</s> add </s> remove filterFileContents, err := ioutil.ReadFile(filterFilePath)
</s> add file, err := os.Open(filterFilePath) </s> remove // Perform upgrade on a filter
func (filter *filter) update() (bool, error) {
</s> add func (f *Filtering) updateIntl(filter *filter) (bool, error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
file, err := os.Open(filterFilePath) | <mask> // do nothing, file doesn't exist
<mask> return err
<mask> }
<mask>
<mask> filterFileContents, err := ioutil.ReadFile(filterFilePath)
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> log.Tracef("File %s, id %d, length %d", filterFilePath, filter.ID, len(filterFileContents))
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove log.Tracef("File %s, id %d, length %d", filterFilePath, filter.ID, len(filterFileContents))
rulesCount, _ := parseFilterContents(filterFileContents)
</s> add log.Tracef("File %s, id %d, length %d",
filterFilePath, filter.ID, st.Size())
rulesCount, checksum, _ := f.parseFilterContents(file) </s> remove filter.Data = nil
filter.checksum = crc32.ChecksumIEEE(filterFileContents)
</s> add filter.checksum = checksum </s> remove func (filter *filter) load() error {
</s> add func (f *Filtering) load(filter *filter) error { </s> remove
err := file.SafeWrite(filterFilePath, filter.Data)
// update LastUpdated field after saving the file
filter.LastUpdated = filter.LastTimeUpdated()
return err
}
func (filter *filter) saveAndBackupOld() error {
filterFilePath := filter.Path()
err := os.Rename(filterFilePath, filterFilePath+".old")
if err != nil && !os.IsNotExist(err) {
return err
</s> add err = os.Rename(tmpfile.Name(), filterFilePath)
if err != nil {
return false, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
defer file.Close()
st, _ := file.Stat() | <mask> return err
<mask> }
<mask>
<mask> log.Tracef("File %s, id %d, length %d",
<mask> filterFilePath, filter.ID, st.Size())
<mask> rulesCount, checksum, _ := f.parseFilterContents(file)
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove log.Tracef("File %s, id %d, length %d", filterFilePath, filter.ID, len(filterFileContents))
rulesCount, _ := parseFilterContents(filterFileContents)
</s> add log.Tracef("File %s, id %d, length %d",
filterFilePath, filter.ID, st.Size())
rulesCount, checksum, _ := f.parseFilterContents(file) </s> remove filter.Data = nil
filter.checksum = crc32.ChecksumIEEE(filterFileContents)
</s> add filter.checksum = checksum </s> remove filterFileContents, err := ioutil.ReadFile(filterFilePath)
</s> add file, err := os.Open(filterFilePath) </s> remove return rulesCount, name
</s> add return rulesCount, checksum, name
}
// Perform upgrade on a filter and update LastUpdated value
func (f *Filtering) update(filter *filter) (bool, error) {
b, err := f.updateIntl(filter)
filter.LastUpdated = time.Now()
if !b {
e := os.Chtimes(filter.Path(), filter.LastUpdated, filter.LastUpdated)
if e != nil {
log.Error("os.Chtimes(): %v", e)
}
}
return b, err | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
log.Tracef("File %s, id %d, length %d",
filterFilePath, filter.ID, st.Size())
rulesCount, checksum, _ := f.parseFilterContents(file) | <mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> log.Tracef("File %s, id %d, length %d", filterFilePath, filter.ID, len(filterFileContents))
<mask> rulesCount, _ := parseFilterContents(filterFileContents)
<mask>
<mask> filter.RulesCount = rulesCount
<mask> filter.Data = nil
<mask> filter.checksum = crc32.ChecksumIEEE(filterFileContents)
<mask> filter.LastUpdated = filter.LastTimeUpdated()
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove filter.Data = nil
filter.checksum = crc32.ChecksumIEEE(filterFileContents)
</s> add filter.checksum = checksum </s> remove filterFileContents, err := ioutil.ReadFile(filterFilePath)
</s> add file, err := os.Open(filterFilePath) </s> remove filter.Data = body
</s> add </s> remove var firstChunk []byte
if len(body) <= 4096 {
firstChunk = body
} else {
firstChunk = body[:4096]
}
if !isPrintableText(firstChunk) {
return false, fmt.Errorf("Data contains non-printable characters")
}
s := strings.ToLower(string(firstChunk))
if strings.Index(s, "<html") >= 0 ||
strings.Index(s, "<!doctype") >= 0 {
return false, fmt.Errorf("Data is HTML, not plain text")
}
// Extract filter name and count number of rules
rulesCount, filterName := parseFilterContents(body)
log.Printf("Filter %d has been updated: %d bytes, %d rules", filter.ID, len(body), rulesCount)
</s> add log.Printf("Filter %d has been updated: %d bytes, %d rules",
filter.ID, total, rulesCount) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
filter.checksum = checksum | <mask> log.Tracef("File %s, id %d, length %d", filterFilePath, filter.ID, len(filterFileContents))
<mask> rulesCount, _ := parseFilterContents(filterFileContents)
<mask>
<mask> filter.RulesCount = rulesCount
<mask> filter.Data = nil
<mask> filter.checksum = crc32.ChecksumIEEE(filterFileContents)
<mask> filter.LastUpdated = filter.LastTimeUpdated()
<mask>
<mask> return nil
<mask> }
<mask>
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove log.Tracef("File %s, id %d, length %d", filterFilePath, filter.ID, len(filterFileContents))
rulesCount, _ := parseFilterContents(filterFileContents)
</s> add log.Tracef("File %s, id %d, length %d",
filterFilePath, filter.ID, st.Size())
rulesCount, checksum, _ := f.parseFilterContents(file) </s> remove filterFileContents, err := ioutil.ReadFile(filterFilePath)
</s> add file, err := os.Open(filterFilePath) </s> remove filter.Data = body
</s> add </s> remove
return true, nil
}
// saves filter contents to the file in dataDir
// This method is safe to call during filters update,
// because it creates a new file and then renames it,
// so the currently opened file descriptors to the old filter file remain valid.
func (filter *filter) save() error {
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
<mask> }
<mask>
<mask> // Clear filter rules
<mask> func (filter *filter) unload() {
<mask> filter.Data = nil
<mask> filter.RulesCount = 0
<mask> }
<mask>
<mask> // Path to the filter contents
<mask> func (filter *filter) Path() string {
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove
return true, nil
}
// saves filter contents to the file in dataDir
// This method is safe to call during filters update,
// because it creates a new file and then renames it,
// so the currently opened file descriptors to the old filter file remain valid.
func (filter *filter) save() error {
</s> add </s> remove
err := file.SafeWrite(filterFilePath, filter.Data)
// update LastUpdated field after saving the file
filter.LastUpdated = filter.LastTimeUpdated()
return err
}
func (filter *filter) saveAndBackupOld() error {
filterFilePath := filter.Path()
err := os.Rename(filterFilePath, filterFilePath+".old")
if err != nil && !os.IsNotExist(err) {
return err
</s> add err = os.Rename(tmpfile.Name(), filterFilePath)
if err != nil {
return false, err </s> remove func (filter *filter) load() error {
</s> add func (f *Filtering) load(filter *filter) error { </s> remove return filter.save()
</s> add tmpfile.Close()
tmpfile = nil
return true, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
|
filter.checksum = 0 | <mask> // Clear filter rules
<mask> func (filter *filter) unload() {
<mask> filter.RulesCount = 0
<mask> }
<mask>
<mask> // Path to the filter contents
<mask> func (filter *filter) Path() string {
<mask> return filepath.Join(Context.getDataDir(), filterDir, strconv.FormatInt(filter.ID, 10)+".txt")
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove filter.Data = nil
</s> add </s> remove
err := file.SafeWrite(filterFilePath, filter.Data)
// update LastUpdated field after saving the file
filter.LastUpdated = filter.LastTimeUpdated()
return err
}
func (filter *filter) saveAndBackupOld() error {
filterFilePath := filter.Path()
err := os.Rename(filterFilePath, filterFilePath+".old")
if err != nil && !os.IsNotExist(err) {
return err
</s> add err = os.Rename(tmpfile.Name(), filterFilePath)
if err != nil {
return false, err </s> remove func (filter *filter) load() error {
</s> add func (f *Filtering) load(filter *filter) error { </s> remove
return true, nil
}
// saves filter contents to the file in dataDir
// This method is safe to call during filters update,
// because it creates a new file and then renames it,
// so the currently opened file descriptors to the old filter file remain valid.
func (filter *filter) save() error {
</s> add </s> remove return filter.save()
</s> add tmpfile.Close()
tmpfile = nil
return true, nil | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter.go |
Timeout: 5 * time.Second, | <mask>
<mask> Context = homeContext{}
<mask> Context.workDir = dir
<mask> Context.client = &http.Client{
<mask> Timeout: time.Minute * 5,
<mask> }
<mask>
<mask> f := filter{
<mask> URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt",
<mask> }
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove f := filter{
</s> add filt := filter{ </s> remove f := filter{
</s> add filt := filter{ </s> remove ok, err := f.update()
assert.True(t, ok && err == nil)
</s> add ok, err := Context.filters.update(&f)
assert.Equal(t, nil, err)
assert.True(t, ok) </s> remove if config.DNS.FiltersUpdateIntervalHours != 0 && atomic.CompareAndSwapUint32(&refreshStatus, 0, 1) {
refreshLock.Lock()
_, isNetworkErr = refreshFiltersIfNecessary(FilterRefreshBlocklists | FilterRefreshAllowlists)
refreshLock.Unlock()
refreshStatus = 0
</s> add if config.DNS.FiltersUpdateIntervalHours != 0 && atomic.CompareAndSwapUint32(&f.refreshStatus, 0, 1) {
f.refreshLock.Lock()
_, isNetworkErr = f.refreshFiltersIfNecessary(FilterRefreshBlocklists | FilterRefreshAllowlists)
f.refreshLock.Unlock()
f.refreshStatus = 0 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter_test.go |
Context.filters.Init() | <mask> Context.client = &http.Client{
<mask> Timeout: 5 * time.Second,
<mask> }
<mask>
<mask> f := filter{
<mask> URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt",
<mask> }
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove Timeout: time.Minute * 5,
</s> add Timeout: 5 * time.Second, </s> remove f := filter{
</s> add filt := filter{ </s> remove f := filter{
</s> add filt := filter{ </s> remove if config.DNS.FiltersUpdateIntervalHours != 0 && atomic.CompareAndSwapUint32(&refreshStatus, 0, 1) {
refreshLock.Lock()
_, isNetworkErr = refreshFiltersIfNecessary(FilterRefreshBlocklists | FilterRefreshAllowlists)
refreshLock.Unlock()
refreshStatus = 0
</s> add if config.DNS.FiltersUpdateIntervalHours != 0 && atomic.CompareAndSwapUint32(&f.refreshStatus, 0, 1) {
f.refreshLock.Lock()
_, isNetworkErr = f.refreshFiltersIfNecessary(FilterRefreshBlocklists | FilterRefreshAllowlists)
f.refreshLock.Unlock()
f.refreshStatus = 0 </s> remove func periodicallyRefreshFilters() {
</s> add func (f *Filtering) periodicallyRefreshFilters() { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter_test.go |
ok, err := Context.filters.update(&f)
assert.Equal(t, nil, err)
assert.True(t, ok) | <mask> URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt",
<mask> }
<mask>
<mask> // download
<mask> ok, err := f.update()
<mask> assert.True(t, ok && err == nil)
<mask>
<mask> // refresh
<mask> ok, err = f.update()
<mask> assert.True(t, !ok && err == nil)
<mask>
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove ok, err = f.update()
</s> add ok, err = Context.filters.update(&f) </s> remove err = f.save()
assert.True(t, err == nil)
err = f.load()
</s> add err = Context.filters.load(&f) </s> remove ok, err := f.update()
</s> add ok, err := f.update(&filt) </s> remove f.ID = assignUniqueFilterID()
</s> add filt.ID = assignUniqueFilterID() </s> remove httpError(w, http.StatusBadRequest, "Couldn't fetch filter from url %s: %s", f.URL, err)
return
}
if f.RulesCount == 0 {
httpError(w, http.StatusBadRequest, "Filter at the url %s has no rules (maybe it points to blank page?)", f.URL)
</s> add httpError(w, http.StatusBadRequest, "Couldn't fetch filter from url %s: %s", filt.URL, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter_test.go |
ok, err = Context.filters.update(&f) | <mask> ok, err := f.update()
<mask> assert.True(t, ok && err == nil)
<mask>
<mask> // refresh
<mask> ok, err = f.update()
<mask> assert.True(t, !ok && err == nil)
<mask>
<mask> err = f.save()
<mask> assert.True(t, err == nil)
<mask>
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove ok, err := f.update()
assert.True(t, ok && err == nil)
</s> add ok, err := Context.filters.update(&f)
assert.Equal(t, nil, err)
assert.True(t, ok) </s> remove err = f.save()
assert.True(t, err == nil)
err = f.load()
</s> add err = Context.filters.load(&f) </s> remove ok, err := f.update()
</s> add ok, err := f.update(&filt) </s> remove f.ID = assignUniqueFilterID()
</s> add filt.ID = assignUniqueFilterID() </s> remove httpError(w, http.StatusBadRequest, "Couldn't fetch filter from url %s: %s", f.URL, err)
return
}
if f.RulesCount == 0 {
httpError(w, http.StatusBadRequest, "Filter at the url %s has no rules (maybe it points to blank page?)", f.URL)
</s> add httpError(w, http.StatusBadRequest, "Couldn't fetch filter from url %s: %s", filt.URL, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter_test.go |
err = Context.filters.load(&f) | <mask> // refresh
<mask> ok, err = f.update()
<mask> assert.True(t, !ok && err == nil)
<mask>
<mask> err = f.save()
<mask> assert.True(t, err == nil)
<mask>
<mask> err = f.load()
<mask> assert.True(t, err == nil)
<mask>
<mask> f.unload()
<mask> _ = os.Remove(f.Path())
<mask> }
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove ok, err = f.update()
</s> add ok, err = Context.filters.update(&f) </s> remove ok, err := f.update()
assert.True(t, ok && err == nil)
</s> add ok, err := Context.filters.update(&f)
assert.Equal(t, nil, err)
assert.True(t, ok) </s> remove ok, err := f.update()
</s> add ok, err := f.update(&filt) </s> remove f.ID = assignUniqueFilterID()
</s> add filt.ID = assignUniqueFilterID() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/filter_test.go |
filters Filtering | <mask> auth *Auth // HTTP authentication module
<mask> httpServer *http.Server // HTTP module
<mask> httpsServer HTTPSServer // HTTPS module
<mask>
<mask> // Runtime properties
<mask> // --
<mask>
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID
filterTitleRegexp = regexp.MustCompile(`^! Title: +(.*)$`)
</s> add nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID
)
// type FilteringConf struct {
// BlockLists []filter
// AllowLists []filter
// UserRules []string
// }
// Filtering - module object
type Filtering struct {
// conf FilteringConf </s> remove func startFiltering() {
</s> add // Start - start the module
func (f *Filtering) Start() {
f.RegisterFilteringHandlers()
</s> remove func initFiltering() {
loadFilters(config.Filters)
loadFilters(config.WhitelistFilters)
</s> add // Init - initialize the module
func (f *Filtering) Init() {
f.filterTitleRegexp = regexp.MustCompile(`^! Title: +(.*)$`)
_ = os.MkdirAll(filepath.Join(Context.getDataDir(), filterDir), 0755)
f.loadFilters(config.Filters)
f.loadFilters(config.WhitelistFilters) </s> remove go periodicallyRefreshFilters()
</s> add go f.periodicallyRefreshFilters()
}
// Close - close the module
func (f *Filtering) Close() { </s> remove f := filter{
</s> add filt := filter{ | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | home/home.go |
<mask> "runtime"
<mask> "strings"
<mask> )
<mask>
<mask> // ---------------------
<mask> // general helpers
<mask> // ---------------------
<mask>
<mask> // fileExists returns TRUE if file exists
<mask> func FileExists(fn string) bool {
<mask> _, err := os.Stat(fn)
<mask> if err != nil {
<mask> return false
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove // ---------------------
// debug logging helpers
// ---------------------
</s> add </s> remove func parseFilterContents(contents []byte) (int, string) {
data := string(contents)
</s> add func (f *Filtering) parseFilterContents(file io.Reader) (int, uint32, string) { </s> remove func (filter *filter) load() error {
</s> add func (f *Filtering) load(filter *filter) error { </s> remove
err := file.SafeWrite(filterFilePath, filter.Data)
// update LastUpdated field after saving the file
filter.LastUpdated = filter.LastTimeUpdated()
return err
}
func (filter *filter) saveAndBackupOld() error {
filterFilePath := filter.Path()
err := os.Rename(filterFilePath, filterFilePath+".old")
if err != nil && !os.IsNotExist(err) {
return err
</s> add err = os.Rename(tmpfile.Name(), filterFilePath)
if err != nil {
return false, err </s> remove return filter.save()
</s> add tmpfile.Close()
tmpfile = nil
return true, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | util/helpers.go |
|
<mask>
<mask> return cmd.ProcessState.ExitCode(), string(out), nil
<mask> }
<mask>
<mask> // ---------------------
<mask> // debug logging helpers
<mask> // ---------------------
<mask> func FuncName() string {
<mask> pc := make([]uintptr, 10) // at least 1 entry needed
<mask> runtime.Callers(2, pc)
<mask> f := runtime.FuncForPC(pc[0])
<mask> return path.Base(f.Name())
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove // ---------------------
// general helpers
// ---------------------
</s> add </s> remove nUpdated, _ := refreshFilters(flags, true)
</s> add nUpdated, _ := f.refreshFilters(flags, true) </s> remove f := filter{
</s> add filt := filter{ </s> remove func periodicallyRefreshFilters() {
</s> add func (f *Filtering) periodicallyRefreshFilters() { </s> remove func handleFilteringStatus(w http.ResponseWriter, r *http.Request) {
</s> add func (f *Filtering) handleFilteringStatus(w http.ResponseWriter, r *http.Request) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | util/helpers.go |
|
// MinInt - return the minimum value
func MinInt(a, b int) int {
if a < b {
return a
}
return b
} | <mask> *str = ""
<mask> }
<mask> return strings.TrimSpace(s)
<mask> }
</s> Merge: * DNS filters: optimize filter update
Close #1463
Squashed commit of the following:
commit d5bdc939a2ae9f6d1ae879e4225b1dce09657b92
Author: Simon Zolin <[email protected]>
Date: Mon Mar 16 16:39:17 2020 +0300
minor
commit e15b56a0d9db182f9d30b434584018cb1bf038d5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:39:07 2020 +0300
minor
commit 77bf59ca6e556b75af48c5987866af6d5025dae8
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:30:04 2020 +0300
minor
commit e19c13f82dd408ed638bd4b68d21cdfebbdf782f
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:24:50 2020 +0300
minor
commit 9113c6dae6263aa7ee6e4295c2b60dd3083e2bf0
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 14:02:06 2020 +0300
minor
commit 70283e329e32def3375e893f806a2a02d8ca9f57
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:35:11 2020 +0300
logical module Filtering
commit 837a255c6a04941e9fc007a56d71faf4c4213257
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 13:11:37 2020 +0300
minor
commit 1853ed2b57a86dd49508023f47218219399b4fe5
Author: Simon Zolin <[email protected]>
Date: Thu Mar 12 12:59:28 2020 +0300
refactor
commit 1ba3cc53c76255439fe54693b40ee9665fdc15e4
Author: Simon Zolin <[email protected]>
Date: Wed Mar 11 20:12:53 2020 +0300
* filters: optimize update procedure </s> remove filter.Data = body
</s> add </s> remove var firstChunk []byte
if len(body) <= 4096 {
firstChunk = body
} else {
firstChunk = body[:4096]
}
if !isPrintableText(firstChunk) {
return false, fmt.Errorf("Data contains non-printable characters")
}
s := strings.ToLower(string(firstChunk))
if strings.Index(s, "<html") >= 0 ||
strings.Index(s, "<!doctype") >= 0 {
return false, fmt.Errorf("Data is HTML, not plain text")
}
// Extract filter name and count number of rules
rulesCount, filterName := parseFilterContents(body)
log.Printf("Filter %d has been updated: %d bytes, %d rules", filter.ID, len(body), rulesCount)
</s> add log.Printf("Filter %d has been updated: %d bytes, %d rules",
filter.ID, total, rulesCount) </s> remove userFilter := userFilter()
err = userFilter.save()
if err != nil {
log.Error("Couldn't save the user filter: %s", err)
return err
}
</s> add </s> remove // Count lines in the filter
for len(data) != 0 {
line := util.SplitNext(&data, '\n')
</s> add checksum = crc32.Update(checksum, crc32.IEEETable, []byte(line))
line = strings.TrimSpace(line) | [
"keep",
"keep",
"keep",
"add"
] | https://github.com/AdguardTeam/AdGuardHome/commit/646725efb7ea5693fc537ae88ec259ddfa21dd80 | util/helpers.go |
github.com/AdguardTeam/dnsproxy v0.40.0 | <mask>
<mask> go 1.17
<mask>
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.39.13
<mask> github.com/AdguardTeam/golibs v0.10.3
<mask> github.com/AdguardTeam/urlfilter v0.15.1
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/ameshkov/dnscrypt/v2 v2.2.3
<mask> github.com/digineo/go-ipset/v2 v2.2.1
</s> Pull request: all: upd dnsproxy
Updates #3977.
Squashed commit of the following:
commit 3aaaacac102cdea04ae46b36d2dd3a3be7d50147
Author: Ainar Garipov <[email protected]>
Date: Thu Dec 23 16:15:11 2021 +0300
all: upd dnsproxy </s> remove github.com/AdguardTeam/dnsproxy v0.39.13 h1:7YM5Mr4EpFZ8UO4/4xd6zBG3lZ6AzZO6Xq29Cr4ydOY=
github.com/AdguardTeam/dnsproxy v0.39.13/go.mod h1:g7zjF1TWpKNeDVh6h3YrjQN8565zsWRd7zo++C/935c=
</s> add github.com/AdguardTeam/dnsproxy v0.40.0 h1:4JeOCG7aOEQxXhvAZwI7VknuHjXYJlwehO5ufkkrJaQ=
github.com/AdguardTeam/dnsproxy v0.40.0/go.mod h1:PZ9l22h3Er+5mxFQB7oHZMTvx+aa9R6LbzA/ikXQlS0= </s> remove github.com/ameshkov/dnscrypt/v2 v2.2.2/go.mod h1:+8SbPbVXpxxcUsgGi8eodkqWPo1MyNHxKYC8hDpqLSo=
</s> add </s> remove github.com/joomcode/errorx v1.0.3 // indirect
</s> add </s> remove gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
</s> add gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> remove golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/64e751e579fac33add077743dc1d9ff39da5722c | go.mod |
<mask> github.com/cheekybits/genny v1.0.0 // indirect
<mask> github.com/davecgh/go-spew v1.1.1 // indirect
<mask> github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
<mask> github.com/google/uuid v1.3.0 // indirect
<mask> github.com/joomcode/errorx v1.0.3 // indirect
<mask> github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect
<mask> github.com/marten-seemann/qtls-go1-16 v0.1.4 // indirect
<mask> github.com/marten-seemann/qtls-go1-17 v0.1.0 // indirect
<mask> github.com/mdlayher/socket v0.1.1 // indirect
<mask> github.com/nxadm/tail v1.4.8 // indirect
</s> Pull request: all: upd dnsproxy
Updates #3977.
Squashed commit of the following:
commit 3aaaacac102cdea04ae46b36d2dd3a3be7d50147
Author: Ainar Garipov <[email protected]>
Date: Thu Dec 23 16:15:11 2021 +0300
all: upd dnsproxy </s> remove gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
</s> add gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect </s> remove github.com/joomcode/errorx v1.0.3 h1:3e1mi0u7/HTPNdg6d6DYyKGBhA5l9XpsfuVE29NxnWw=
github.com/joomcode/errorx v1.0.3/go.mod h1:eQzdtdlNyN7etw6YCS4W4+lu442waxZYw5yvz0ULrRo=
</s> add github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= </s> remove github.com/marten-seemann/qtls-go1-17 v0.1.0-beta.1.2/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8=
</s> add </s> remove github.com/marten-seemann/qtls-go1-16 v0.1.3/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
</s> add </s> remove github.com/go-test/deep v1.0.5/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/64e751e579fac33add077743dc1d9ff39da5722c | go.mod |
|
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect | <mask> golang.org/x/text v0.3.7 // indirect
<mask> golang.org/x/tools v0.1.8 // indirect
<mask> golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
<mask> gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
<mask> gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
<mask> honnef.co/go/tools v0.2.2 // indirect
<mask> )
</s> Pull request: all: upd dnsproxy
Updates #3977.
Squashed commit of the following:
commit 3aaaacac102cdea04ae46b36d2dd3a3be7d50147
Author: Ainar Garipov <[email protected]>
Date: Thu Dec 23 16:15:11 2021 +0300
all: upd dnsproxy </s> remove github.com/joomcode/errorx v1.0.3 // indirect
</s> add </s> remove gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
</s> add gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> remove golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
</s> add </s> remove golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/64e751e579fac33add077743dc1d9ff39da5722c | go.mod |
github.com/AdguardTeam/dnsproxy v0.40.0 h1:4JeOCG7aOEQxXhvAZwI7VknuHjXYJlwehO5ufkkrJaQ=
github.com/AdguardTeam/dnsproxy v0.40.0/go.mod h1:PZ9l22h3Er+5mxFQB7oHZMTvx+aa9R6LbzA/ikXQlS0= | <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.39.13 h1:7YM5Mr4EpFZ8UO4/4xd6zBG3lZ6AzZO6Xq29Cr4ydOY=
<mask> github.com/AdguardTeam/dnsproxy v0.39.13/go.mod h1:g7zjF1TWpKNeDVh6h3YrjQN8565zsWRd7zo++C/935c=
<mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.9.2/go.mod h1:fCAMwPBJ8S7YMYbTWvYS+eeTLblP5E04IDtNAo7y7IY=
<mask> github.com/AdguardTeam/golibs v0.10.3 h1:FBgk17zf35ESVWQKIqEUiqqB2bDaCBC8X5vMU760yB4=
<mask> github.com/AdguardTeam/golibs v0.10.3/go.mod h1:rSfQRGHIdgfxriDDNgNJ7HmE5zRoURq8R+VdR81Zuzw=
</s> Pull request: all: upd dnsproxy
Updates #3977.
Squashed commit of the following:
commit 3aaaacac102cdea04ae46b36d2dd3a3be7d50147
Author: Ainar Garipov <[email protected]>
Date: Thu Dec 23 16:15:11 2021 +0300
all: upd dnsproxy </s> remove github.com/AdguardTeam/dnsproxy v0.39.13
</s> add github.com/AdguardTeam/dnsproxy v0.40.0 </s> remove gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
</s> add gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> remove golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
</s> add </s> remove golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/64e751e579fac33add077743dc1d9ff39da5722c | go.sum |
<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=
<mask> github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 h1:52m0LGchQBBVqJRyYYufQuIbVqRawmubW3OFGqK1ekw=
<mask> github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635/go.mod h1:lmLxL+FV291OopO93Bwf9fQLQeLyt33VJRUg5VJ30us=
<mask> github.com/ameshkov/dnscrypt/v2 v2.2.2/go.mod h1:+8SbPbVXpxxcUsgGi8eodkqWPo1MyNHxKYC8hDpqLSo=
<mask> github.com/ameshkov/dnscrypt/v2 v2.2.3 h1:X9UP5AHtwp46Ji+sGFfF/1Is6OPI/SjxLqhKpx0P5UI=
<mask> github.com/ameshkov/dnscrypt/v2 v2.2.3/go.mod h1:xJB9cE1/GF+NB6EEQqRlkoa4bjcV2w7VYn1G+zVq7Bs=
<mask> github.com/ameshkov/dnsstamps v1.0.1/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A=
<mask> github.com/ameshkov/dnsstamps v1.0.3 h1:Srzik+J9mivH1alRACTbys2xOxs0lRH9qnTA7Y1OYVo=
<mask> github.com/ameshkov/dnsstamps v1.0.3/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A=
</s> Pull request: all: upd dnsproxy
Updates #3977.
Squashed commit of the following:
commit 3aaaacac102cdea04ae46b36d2dd3a3be7d50147
Author: Ainar Garipov <[email protected]>
Date: Thu Dec 23 16:15:11 2021 +0300
all: upd dnsproxy </s> remove github.com/AdguardTeam/dnsproxy v0.39.13
</s> add github.com/AdguardTeam/dnsproxy v0.40.0 </s> remove github.com/joomcode/errorx v1.0.3 h1:3e1mi0u7/HTPNdg6d6DYyKGBhA5l9XpsfuVE29NxnWw=
github.com/joomcode/errorx v1.0.3/go.mod h1:eQzdtdlNyN7etw6YCS4W4+lu442waxZYw5yvz0ULrRo=
</s> add github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= </s> remove github.com/marten-seemann/qtls-go1-17 v0.1.0-beta.1.2/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8=
</s> add </s> remove github.com/joomcode/errorx v1.0.3 // indirect
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/64e751e579fac33add077743dc1d9ff39da5722c | go.sum |
|
<mask> github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534 h1:dhy9OQKGBh4zVXbjwbxxHjRxMJtLXj3zfgpBYQaR4Q4=
<mask> github.com/go-ping/ping v0.0.0-20211130115550-779d1e919534/go.mod h1:xIFjORFzTxqIV/tDVGO4eDy/bLuSyawEeojSm3GfRGk=
<mask> github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
<mask> github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
<mask> github.com/go-test/deep v1.0.5/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=
<mask> github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
<mask> github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
<mask> github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
<mask> github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
<mask> github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
</s> Pull request: all: upd dnsproxy
Updates #3977.
Squashed commit of the following:
commit 3aaaacac102cdea04ae46b36d2dd3a3be7d50147
Author: Ainar Garipov <[email protected]>
Date: Thu Dec 23 16:15:11 2021 +0300
all: upd dnsproxy </s> remove github.com/joomcode/errorx v1.0.3 // indirect
</s> add </s> remove golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
</s> add </s> remove gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
</s> add gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> remove golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/64e751e579fac33add077743dc1d9ff39da5722c | go.sum |
|
github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= | <mask> github.com/insomniacslk/dhcp v0.0.0-20211214070828-5297eed8f489 h1:jhdHqd7DxBrzfuFSoPxjD6nUVaV/1RIn9aHA0WCf/as=
<mask> github.com/insomniacslk/dhcp v0.0.0-20211214070828-5297eed8f489/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E=
<mask> github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU=
<mask> github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
<mask> github.com/joomcode/errorx v1.0.3 h1:3e1mi0u7/HTPNdg6d6DYyKGBhA5l9XpsfuVE29NxnWw=
<mask> github.com/joomcode/errorx v1.0.3/go.mod h1:eQzdtdlNyN7etw6YCS4W4+lu442waxZYw5yvz0ULrRo=
<mask> github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 h1:uhL5Gw7BINiiPAo24A2sxkcDI0Jt/sqp1v5xQCniEFA=
<mask> github.com/josharian/native v0.0.0-20200817173448-b6b71def0850/go.mod h1:7X/raswPFr05uY3HiLlYeyQntB6OO7E/d2Cu7qoaN2w=
<mask> github.com/jsimonetti/rtnetlink v0.0.0-20190606172950-9527aa82566a/go.mod h1:Oz+70psSo5OFh8DBl0Zv2ACw7Esh6pPUphlvZG9x7uw=
<mask> github.com/jsimonetti/rtnetlink v0.0.0-20200117123717-f846d4f6c1f4/go.mod h1:WGuG/smIU4J/54PblvSbh+xvCZmpJnFgr3ds6Z55XMQ=
<mask> github.com/jsimonetti/rtnetlink v0.0.0-20201009170750-9c6f07d100c1/go.mod h1:hqoO/u39cqLeBLebZ8fWdE96O7FxrAsRYhnVOdgHxok=
</s> Pull request: all: upd dnsproxy
Updates #3977.
Squashed commit of the following:
commit 3aaaacac102cdea04ae46b36d2dd3a3be7d50147
Author: Ainar Garipov <[email protected]>
Date: Thu Dec 23 16:15:11 2021 +0300
all: upd dnsproxy </s> remove github.com/joomcode/errorx v1.0.3 // indirect
</s> add </s> remove github.com/ameshkov/dnscrypt/v2 v2.2.2/go.mod h1:+8SbPbVXpxxcUsgGi8eodkqWPo1MyNHxKYC8hDpqLSo=
</s> add </s> remove gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
</s> add gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> remove golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/64e751e579fac33add077743dc1d9ff39da5722c | go.sum |
<mask> github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
<mask> github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
<mask> github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
<mask> github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
<mask> github.com/lucas-clemente/quic-go v0.21.1/go.mod h1:U9kFi5LKbNIlU30dkuM9vxmTxWq4Bvzee/MjBI+07UA=
<mask> github.com/lucas-clemente/quic-go v0.24.0 h1:ToR7SIIEdrgOhgVTHvPgdVRJfgVy+N0wQAagH7L4d5g=
<mask> github.com/lucas-clemente/quic-go v0.24.0/go.mod h1:paZuzjXCE5mj6sikVLMvqXk8lJV2AsqtJ6bDhjEfxx0=
<mask> github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
<mask> github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
<mask> github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc=
</s> Pull request: all: upd dnsproxy
Updates #3977.
Squashed commit of the following:
commit 3aaaacac102cdea04ae46b36d2dd3a3be7d50147
Author: Ainar Garipov <[email protected]>
Date: Thu Dec 23 16:15:11 2021 +0300
all: upd dnsproxy </s> remove github.com/marten-seemann/qtls-go1-16 v0.1.3/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
</s> add </s> remove github.com/marten-seemann/qtls-go1-17 v0.1.0-beta.1.2/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8=
</s> add </s> remove gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
</s> add gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> remove golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/64e751e579fac33add077743dc1d9ff39da5722c | go.sum |
|
<mask> github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
<mask> github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
<mask> github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc=
<mask> github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
<mask> github.com/marten-seemann/qtls-go1-16 v0.1.3/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
<mask> github.com/marten-seemann/qtls-go1-16 v0.1.4 h1:xbHbOGGhrenVtII6Co8akhLEdrawwB2iHl5yhJRpnco=
<mask> github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
<mask> github.com/marten-seemann/qtls-go1-17 v0.1.0-beta.1.2/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8=
<mask> github.com/marten-seemann/qtls-go1-17 v0.1.0 h1:P9ggrs5xtwiqXv/FHNwntmuLMNq3KaSIG93AtAZ48xk=
<mask> github.com/marten-seemann/qtls-go1-17 v0.1.0/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8=
</s> Pull request: all: upd dnsproxy
Updates #3977.
Squashed commit of the following:
commit 3aaaacac102cdea04ae46b36d2dd3a3be7d50147
Author: Ainar Garipov <[email protected]>
Date: Thu Dec 23 16:15:11 2021 +0300
all: upd dnsproxy </s> remove github.com/marten-seemann/qtls-go1-17 v0.1.0-beta.1.2/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8=
</s> add </s> remove github.com/lucas-clemente/quic-go v0.21.1/go.mod h1:U9kFi5LKbNIlU30dkuM9vxmTxWq4Bvzee/MjBI+07UA=
</s> add </s> remove github.com/joomcode/errorx v1.0.3 // indirect
</s> add </s> remove gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
</s> add gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> remove golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/64e751e579fac33add077743dc1d9ff39da5722c | go.sum |
|
<mask> github.com/marten-seemann/qtls-go1-15 v0.1.4/go.mod h1:GyFwywLKkRt+6mfU99csTEY1joMZz5vmB1WNZH3P81I=
<mask> github.com/marten-seemann/qtls-go1-16 v0.1.3/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
<mask> github.com/marten-seemann/qtls-go1-16 v0.1.4 h1:xbHbOGGhrenVtII6Co8akhLEdrawwB2iHl5yhJRpnco=
<mask> github.com/marten-seemann/qtls-go1-16 v0.1.4/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
<mask> github.com/marten-seemann/qtls-go1-17 v0.1.0-beta.1.2/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8=
<mask> github.com/marten-seemann/qtls-go1-17 v0.1.0 h1:P9ggrs5xtwiqXv/FHNwntmuLMNq3KaSIG93AtAZ48xk=
<mask> github.com/marten-seemann/qtls-go1-17 v0.1.0/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8=
<mask> github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
<mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7 h1:lez6TS6aAau+8wXUP3G9I3TGlmPFEq2CTxBaRqY6AGE=
<mask> github.com/mdlayher/ethernet v0.0.0-20190606142754-0394541c37b7/go.mod h1:U6ZQobyTjI/tJyq2HG+i/dfSoFUt8/aZCM+GKtmFk/Y=
</s> Pull request: all: upd dnsproxy
Updates #3977.
Squashed commit of the following:
commit 3aaaacac102cdea04ae46b36d2dd3a3be7d50147
Author: Ainar Garipov <[email protected]>
Date: Thu Dec 23 16:15:11 2021 +0300
all: upd dnsproxy </s> remove github.com/marten-seemann/qtls-go1-16 v0.1.3/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
</s> add </s> remove github.com/joomcode/errorx v1.0.3 // indirect
</s> add </s> remove github.com/lucas-clemente/quic-go v0.21.1/go.mod h1:U9kFi5LKbNIlU30dkuM9vxmTxWq4Bvzee/MjBI+07UA=
</s> add </s> remove github.com/ameshkov/dnscrypt/v2 v2.2.2/go.mod h1:+8SbPbVXpxxcUsgGi8eodkqWPo1MyNHxKYC8hDpqLSo=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/64e751e579fac33add077743dc1d9ff39da5722c | go.sum |
|
github.com/miekg/dns v1.1.44/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME= | <mask> github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4=
<mask> github.com/miekg/dns v1.1.40/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
<mask> github.com/miekg/dns v1.1.43/go.mod h1:+evo5L0630/F6ca/Z9+GAqzhjGyn8/c+TBaOyfEl0V4=
<mask> github.com/miekg/dns v1.1.45 h1:g5fRIhm9nx7g8osrAvgb16QJfmyMsyOCb+J7LSv+Qzk=
<mask> github.com/miekg/dns v1.1.45/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
<mask> github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
<mask> github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
<mask> github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo=
<mask> github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM=
</s> Pull request: all: upd dnsproxy
Updates #3977.
Squashed commit of the following:
commit 3aaaacac102cdea04ae46b36d2dd3a3be7d50147
Author: Ainar Garipov <[email protected]>
Date: Thu Dec 23 16:15:11 2021 +0300
all: upd dnsproxy </s> remove github.com/marten-seemann/qtls-go1-17 v0.1.0-beta.1.2/go.mod h1:fz4HIxByo+LlWcreM4CZOYNuz3taBQ8rN2X6FqvaWo8=
</s> add </s> remove github.com/ameshkov/dnscrypt/v2 v2.2.2/go.mod h1:+8SbPbVXpxxcUsgGi8eodkqWPo1MyNHxKYC8hDpqLSo=
</s> add </s> remove gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
</s> add gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> remove golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/64e751e579fac33add077743dc1d9ff39da5722c | go.sum |
<mask> golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
<mask> golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
<mask> golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 h1:0es+/5331RGQPcXlMfP+WrnIIS6dNnNRe0WB02W0F4M=
<mask> golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
<mask> golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
<mask> golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
<mask> golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
</s> Pull request: all: upd dnsproxy
Updates #3977.
Squashed commit of the following:
commit 3aaaacac102cdea04ae46b36d2dd3a3be7d50147
Author: Ainar Garipov <[email protected]>
Date: Thu Dec 23 16:15:11 2021 +0300
all: upd dnsproxy </s> remove github.com/go-test/deep v1.0.5/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=
</s> add </s> remove gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
</s> add gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> remove golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
</s> add </s> remove golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/64e751e579fac33add077743dc1d9ff39da5722c | go.sum |
|
<mask> golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> Pull request: all: upd dnsproxy
Updates #3977.
Squashed commit of the following:
commit 3aaaacac102cdea04ae46b36d2dd3a3be7d50147
Author: Ainar Garipov <[email protected]>
Date: Thu Dec 23 16:15:11 2021 +0300
all: upd dnsproxy </s> remove golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
</s> add </s> remove gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
</s> add gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> remove golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/64e751e579fac33add077743dc1d9ff39da5722c | go.sum |
|
golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | <mask> golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> Pull request: all: upd dnsproxy
Updates #3977.
Squashed commit of the following:
commit 3aaaacac102cdea04ae46b36d2dd3a3be7d50147
Author: Ainar Garipov <[email protected]>
Date: Thu Dec 23 16:15:11 2021 +0300
all: upd dnsproxy </s> remove golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add </s> remove golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
</s> add </s> remove gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
</s> add gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> remove golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/64e751e579fac33add077743dc1d9ff39da5722c | go.sum |
<mask> golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM=
<mask> golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
<mask> golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
<mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
<mask> golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
</s> Pull request: all: upd dnsproxy
Updates #3977.
Squashed commit of the following:
commit 3aaaacac102cdea04ae46b36d2dd3a3be7d50147
Author: Ainar Garipov <[email protected]>
Date: Thu Dec 23 16:15:11 2021 +0300
all: upd dnsproxy </s> remove golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
</s> add </s> remove gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
</s> add gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect </s> remove gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
</s> add gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= </s> remove golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/64e751e579fac33add077743dc1d9ff39da5722c | go.sum |
|
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= | <mask> gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
<mask> gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
<mask> gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
<mask> gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
<mask> gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
<mask> gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
<mask> grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o=
<mask> honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
<mask> honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
<mask> honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
<mask> honnef.co/go/tools v0.2.1/go.mod h1:lPVVZ2BS5TfnjLyizF7o7hv7j9/L+8cZY2hLyjP9cGY=
</s> Pull request: all: upd dnsproxy
Updates #3977.
Squashed commit of the following:
commit 3aaaacac102cdea04ae46b36d2dd3a3be7d50147
Author: Ainar Garipov <[email protected]>
Date: Thu Dec 23 16:15:11 2021 +0300
all: upd dnsproxy </s> remove gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
</s> add gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect </s> remove github.com/marten-seemann/qtls-go1-16 v0.1.3/go.mod h1:gNpI2Ol+lRS3WwSOtIUUtRwZEQMXjYK+dQSBFbethAk=
</s> add </s> remove github.com/lucas-clemente/quic-go v0.21.1/go.mod h1:U9kFi5LKbNIlU30dkuM9vxmTxWq4Bvzee/MjBI+07UA=
</s> add </s> remove golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/64e751e579fac33add077743dc1d9ff39da5722c | go.sum |
"build-dev": "cross-env NODE_ENV=development webpack --config webpack.dev.js",
"watch": "cross-env NODE_ENV=development webpack --config webpack.dev.js --watch",
"build-prod": "cross-env NODE_ENV=production webpack --config webpack.prod.js", | <mask> "name": "dashboard",
<mask> "version": "0.1.0",
<mask> "private": true,
<mask> "scripts": {
<mask> "build-dev": "NODE_ENV=development ./node_modules/.bin/webpack --config webpack.dev.js",
<mask> "watch": "NODE_ENV=development ./node_modules/.bin/webpack --config webpack.dev.js --watch",
<mask> "build-prod": "NODE_ENV=production ./node_modules/.bin/webpack --config webpack.prod.js",
<mask> "lint": "eslint client/"
<mask> },
<mask> "dependencies": {
<mask> "@nivo/line": "^0.49.1",
<mask> "axios": "^0.19.0",
</s> *: added cross-env to npm scripts </s> remove "webpack-merge": "^4.1.3",
"svg-url-loader": "^2.3.2"
</s> add "webpack-merge": "^4.1.3" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6503bab1aaa27ff43175d069413630a420093be0 | client/package.json |
"cross-env": "^7.0.2", | <mask> "compression-webpack-plugin": "^1.1.11",
<mask> "copy-webpack-plugin": "^4.6.0",
<mask> "css-loader": "^2.1.1",
<mask> "eslint": "^4.19.1",
<mask> "eslint-config-airbnb-base": "^12.1.0",
<mask> "eslint-config-react-app": "^2.1.0",
<mask> "eslint-import-resolver-webpack": "^0.12.1",
<mask> "eslint-loader": "1.9.0",
</s> *: added cross-env to npm scripts </s> remove "webpack-merge": "^4.1.3",
"svg-url-loader": "^2.3.2"
</s> add "webpack-merge": "^4.1.3" </s> remove "build-dev": "NODE_ENV=development ./node_modules/.bin/webpack --config webpack.dev.js",
"watch": "NODE_ENV=development ./node_modules/.bin/webpack --config webpack.dev.js --watch",
"build-prod": "NODE_ENV=production ./node_modules/.bin/webpack --config webpack.prod.js",
</s> add "build-dev": "cross-env NODE_ENV=development webpack --config webpack.dev.js",
"watch": "cross-env NODE_ENV=development webpack --config webpack.dev.js --watch",
"build-prod": "cross-env NODE_ENV=production webpack --config webpack.prod.js", | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6503bab1aaa27ff43175d069413630a420093be0 | client/package.json |
"svg-url-loader": "^2.3.2", | <mask> "stylelint": "^9.10.1",
<mask> "stylelint-webpack-plugin": "0.10.4",
<mask> "uglifyjs-webpack-plugin": "^1.2.7",
<mask> "url-loader": "^1.0.1",
<mask> "webpack": "3.8.1",
<mask> "webpack-dev-server": "^3.1.14",
<mask> "webpack-merge": "^4.1.3"
<mask> }
</s> *: added cross-env to npm scripts </s> remove "webpack-merge": "^4.1.3",
"svg-url-loader": "^2.3.2"
</s> add "webpack-merge": "^4.1.3" </s> remove "build-dev": "NODE_ENV=development ./node_modules/.bin/webpack --config webpack.dev.js",
"watch": "NODE_ENV=development ./node_modules/.bin/webpack --config webpack.dev.js --watch",
"build-prod": "NODE_ENV=production ./node_modules/.bin/webpack --config webpack.prod.js",
</s> add "build-dev": "cross-env NODE_ENV=development webpack --config webpack.dev.js",
"watch": "cross-env NODE_ENV=development webpack --config webpack.dev.js --watch",
"build-prod": "cross-env NODE_ENV=production webpack --config webpack.prod.js", | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6503bab1aaa27ff43175d069413630a420093be0 | client/package.json |
"webpack-merge": "^4.1.3" | <mask> "uglifyjs-webpack-plugin": "^1.2.7",
<mask> "url-loader": "^1.0.1",
<mask> "webpack": "3.8.1",
<mask> "webpack-dev-server": "^3.1.14",
<mask> "webpack-merge": "^4.1.3",
<mask> "svg-url-loader": "^2.3.2"
<mask> }
<mask> }
</s> *: added cross-env to npm scripts </s> remove "build-dev": "NODE_ENV=development ./node_modules/.bin/webpack --config webpack.dev.js",
"watch": "NODE_ENV=development ./node_modules/.bin/webpack --config webpack.dev.js --watch",
"build-prod": "NODE_ENV=production ./node_modules/.bin/webpack --config webpack.prod.js",
</s> add "build-dev": "cross-env NODE_ENV=development webpack --config webpack.dev.js",
"watch": "cross-env NODE_ENV=development webpack --config webpack.dev.js --watch",
"build-prod": "cross-env NODE_ENV=production webpack --config webpack.prod.js", | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6503bab1aaa27ff43175d069413630a420093be0 | client/package.json |
return d
}
func (d *Dnsfilter) Start() { | <mask> return nil
<mask> }
<mask> }
<mask>
<mask> d.filtersInitializerChan = make(chan filtersInitializerParams, 1)
<mask> go d.filtersInitializer()
<mask>
<mask> if d.Config.HTTPRegister != nil { // for tests
<mask> d.registerSecurityHandlers()
</s> Merge: - install: recover from error on DNS server start
Close #1293
Squashed commit of the following:
commit 0981754c5c2c67f2567ee4af0d9ab24377c53413
Merge: ef81f2c8 a6d75118
Author: Simon Zolin <[email protected]>
Date: Thu Jan 16 14:19:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1293-install
commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 18:32:11 2019 +0300
linter
commit 9e205be53d9de25bd2ad63398644e14b09f95238
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 17:22:17 2019 +0300
- install: recover from error on DNS server start
Close all modules properly
Don't register HTTP handlers twice </s> remove return d
</s> add </s> remove return &l
</s> add </s> remove Context.queryLog.Close()
Context.queryLog = nil
</s> add if config.auth != nil {
config.auth.Close()
config.auth = nil
} </s> remove Context.dnsServer.Close()
</s> add if Context.dnsServer != nil {
Context.dnsServer.Close()
Context.dnsServer = nil
}
if Context.dnsFilter != nil {
Context.dnsFilter.Close()
Context.dnsFilter = nil
} | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a | dnsfilter/dnsfilter.go |
<mask> if d.Config.HTTPRegister != nil { // for tests
<mask> d.registerSecurityHandlers()
<mask> d.registerRewritesHandlers()
<mask> }
<mask> return d
<mask> }
<mask>
<mask> //
<mask> // stats
<mask> //
</s> Merge: - install: recover from error on DNS server start
Close #1293
Squashed commit of the following:
commit 0981754c5c2c67f2567ee4af0d9ab24377c53413
Merge: ef81f2c8 a6d75118
Author: Simon Zolin <[email protected]>
Date: Thu Jan 16 14:19:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1293-install
commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 18:32:11 2019 +0300
linter
commit 9e205be53d9de25bd2ad63398644e14b09f95238
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 17:22:17 2019 +0300
- install: recover from error on DNS server start
Close all modules properly
Don't register HTTP handlers twice </s> remove Context.dnsServer.Close()
</s> add if Context.dnsServer != nil {
Context.dnsServer.Close()
Context.dnsServer = nil
}
if Context.dnsFilter != nil {
Context.dnsFilter.Close()
Context.dnsFilter = nil
} </s> remove Context.dnsFilter.Close()
Context.dnsFilter = nil
</s> add if Context.stats != nil {
Context.stats.Close()
Context.stats = nil
} </s> remove if !s.webRegistered && s.conf.HTTPRegister != nil {
s.webRegistered = true
</s> add if !webRegistered && s.conf.HTTPRegister != nil {
webRegistered = true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a | dnsfilter/dnsfilter.go |
|
var webRegistered bool
| <mask> "https://dns.quad9.net/dns-query",
<mask> }
<mask> var defaultBootstrap = []string{"9.9.9.9", "149.112.112.112"}
<mask>
<mask> // Server is the main way to start a DNS server.
<mask> //
<mask> // Example:
<mask> // s := dnsforward.Server{}
<mask> // err := s.Start(nil) // will start a DNS server listening on default port 53, in a goroutine
</s> Merge: - install: recover from error on DNS server start
Close #1293
Squashed commit of the following:
commit 0981754c5c2c67f2567ee4af0d9ab24377c53413
Merge: ef81f2c8 a6d75118
Author: Simon Zolin <[email protected]>
Date: Thu Jan 16 14:19:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1293-install
commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 18:32:11 2019 +0300
linter
commit 9e205be53d9de25bd2ad63398644e14b09f95238
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 17:22:17 2019 +0300
- install: recover from error on DNS server start
Close all modules properly
Don't register HTTP handlers twice </s> remove webRegistered bool
isRunning bool
</s> add isRunning bool | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a | dnsforward/dnsforward.go |
isRunning bool | <mask> // DNS proxy instance for internal usage
<mask> // We don't Start() it and so no listen port is required.
<mask> internalProxy *proxy.Proxy
<mask>
<mask> webRegistered bool
<mask> isRunning bool
<mask>
<mask> sync.RWMutex
<mask> conf ServerConfig
<mask> }
<mask>
</s> Merge: - install: recover from error on DNS server start
Close #1293
Squashed commit of the following:
commit 0981754c5c2c67f2567ee4af0d9ab24377c53413
Merge: ef81f2c8 a6d75118
Author: Simon Zolin <[email protected]>
Date: Thu Jan 16 14:19:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1293-install
commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 18:32:11 2019 +0300
linter
commit 9e205be53d9de25bd2ad63398644e14b09f95238
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 17:22:17 2019 +0300
- install: recover from error on DNS server start
Close all modules properly
Don't register HTTP handlers twice </s> remove if !s.webRegistered && s.conf.HTTPRegister != nil {
s.webRegistered = true
</s> add if !webRegistered && s.conf.HTTPRegister != nil {
webRegistered = true </s> remove return d
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a | dnsforward/dnsforward.go |
if !webRegistered && s.conf.HTTPRegister != nil {
webRegistered = true | <mask> if len(proxyConfig.Upstreams) == 0 {
<mask> log.Fatal("len(proxyConfig.Upstreams) == 0")
<mask> }
<mask>
<mask> if !s.webRegistered && s.conf.HTTPRegister != nil {
<mask> s.webRegistered = true
<mask> s.registerHandlers()
<mask> }
<mask>
<mask> // Initialize and start the DNS proxy
<mask> s.dnsProxy = &proxy.Proxy{Config: proxyConfig}
</s> Merge: - install: recover from error on DNS server start
Close #1293
Squashed commit of the following:
commit 0981754c5c2c67f2567ee4af0d9ab24377c53413
Merge: ef81f2c8 a6d75118
Author: Simon Zolin <[email protected]>
Date: Thu Jan 16 14:19:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1293-install
commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 18:32:11 2019 +0300
linter
commit 9e205be53d9de25bd2ad63398644e14b09f95238
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 17:22:17 2019 +0300
- install: recover from error on DNS server start
Close all modules properly
Don't register HTTP handlers twice </s> remove Context.dnsServer.Close()
</s> add if Context.dnsServer != nil {
Context.dnsServer.Close()
Context.dnsServer = nil
}
if Context.dnsFilter != nil {
Context.dnsFilter.Close()
Context.dnsFilter = nil
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a | dnsforward/dnsforward.go |
if err2 != nil {
closeDNSServer()
} | <mask> var err2 error
<mask> if err == nil {
<mask> err2 = startDNSServer()
<mask> }
<mask> if err != nil || err2 != nil {
<mask> config.firstRun = true
<mask> copyInstallSettings(&config, &curConfig)
<mask> if err != nil {
<mask> httpError(w, http.StatusInternalServerError, "Couldn't initialize DNS server: %s", err)
</s> Merge: - install: recover from error on DNS server start
Close #1293
Squashed commit of the following:
commit 0981754c5c2c67f2567ee4af0d9ab24377c53413
Merge: ef81f2c8 a6d75118
Author: Simon Zolin <[email protected]>
Date: Thu Jan 16 14:19:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1293-install
commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 18:32:11 2019 +0300
linter
commit 9e205be53d9de25bd2ad63398644e14b09f95238
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 17:22:17 2019 +0300
- install: recover from error on DNS server start
Close all modules properly
Don't register HTTP handlers twice </s> remove if !s.webRegistered && s.conf.HTTPRegister != nil {
s.webRegistered = true
</s> add if !webRegistered && s.conf.HTTPRegister != nil {
webRegistered = true </s> remove Context.dnsServer.Close()
</s> add if Context.dnsServer != nil {
Context.dnsServer.Close()
Context.dnsServer = nil
}
if Context.dnsFilter != nil {
Context.dnsFilter.Close()
Context.dnsFilter = nil
} | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a | home/control_install.go |
closeDNSServer() | <mask> dnsConfig := generateServerConfig()
<mask> err = Context.dnsServer.Prepare(&dnsConfig)
<mask> if err != nil {
<mask> return fmt.Errorf("dnsServer.Prepare: %s", err)
<mask> }
<mask>
<mask> sessFilename := filepath.Join(baseDir, "sessions.db")
<mask> config.auth = InitAuth(sessFilename, config.Users, config.WebSessionTTLHours*60*60)
<mask> if config.auth == nil {
</s> Merge: - install: recover from error on DNS server start
Close #1293
Squashed commit of the following:
commit 0981754c5c2c67f2567ee4af0d9ab24377c53413
Merge: ef81f2c8 a6d75118
Author: Simon Zolin <[email protected]>
Date: Thu Jan 16 14:19:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1293-install
commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 18:32:11 2019 +0300
linter
commit 9e205be53d9de25bd2ad63398644e14b09f95238
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 17:22:17 2019 +0300
- install: recover from error on DNS server start
Close all modules properly
Don't register HTTP handlers twice </s> remove Context.queryLog.Close()
Context.queryLog = nil
</s> add if config.auth != nil {
config.auth.Close()
config.auth = nil
} </s> remove if !s.webRegistered && s.conf.HTTPRegister != nil {
s.webRegistered = true
</s> add if !webRegistered && s.conf.HTTPRegister != nil {
webRegistered = true | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a | home/dns.go |
closeDNSServer() | <mask>
<mask> sessFilename := filepath.Join(baseDir, "sessions.db")
<mask> config.auth = InitAuth(sessFilename, config.Users, config.WebSessionTTLHours*60*60)
<mask> if config.auth == nil {
<mask> return fmt.Errorf("Couldn't initialize Auth module")
<mask> }
<mask> config.Users = nil
<mask>
<mask> Context.rdns = InitRDNS(Context.dnsServer, &Context.clients)
<mask> Context.whois = initWhois(&Context.clients)
</s> Merge: - install: recover from error on DNS server start
Close #1293
Squashed commit of the following:
commit 0981754c5c2c67f2567ee4af0d9ab24377c53413
Merge: ef81f2c8 a6d75118
Author: Simon Zolin <[email protected]>
Date: Thu Jan 16 14:19:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1293-install
commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 18:32:11 2019 +0300
linter
commit 9e205be53d9de25bd2ad63398644e14b09f95238
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 17:22:17 2019 +0300
- install: recover from error on DNS server start
Close all modules properly
Don't register HTTP handlers twice </s> remove Context.queryLog.Close()
Context.queryLog = nil
</s> add if config.auth != nil {
config.auth.Close()
config.auth = nil
} </s> remove config.auth.Close()
config.auth = nil
return nil
</s> add log.Debug("Closed all DNS modules") </s> remove if !s.webRegistered && s.conf.HTTPRegister != nil {
s.webRegistered = true
</s> add if !webRegistered && s.conf.HTTPRegister != nil {
webRegistered = true | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a | home/dns.go |
Context.dnsFilter.Start() | <mask> if err != nil {
<mask> return errorx.Decorate(err, "Couldn't start forwarding DNS server")
<mask> }
<mask>
<mask> startFiltering()
<mask> Context.stats.Start()
<mask> Context.queryLog.Start()
<mask>
<mask> const topClientsNumber = 100 // the number of clients to get
<mask> topClients := Context.stats.GetTopClientsIP(topClientsNumber)
</s> Merge: - install: recover from error on DNS server start
Close #1293
Squashed commit of the following:
commit 0981754c5c2c67f2567ee4af0d9ab24377c53413
Merge: ef81f2c8 a6d75118
Author: Simon Zolin <[email protected]>
Date: Thu Jan 16 14:19:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1293-install
commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 18:32:11 2019 +0300
linter
commit 9e205be53d9de25bd2ad63398644e14b09f95238
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 17:22:17 2019 +0300
- install: recover from error on DNS server start
Close all modules properly
Don't register HTTP handlers twice </s> remove Context.dnsServer.Close()
</s> add if Context.dnsServer != nil {
Context.dnsServer.Close()
Context.dnsServer = nil
}
if Context.dnsFilter != nil {
Context.dnsFilter.Close()
Context.dnsFilter = nil
} </s> remove if !s.webRegistered && s.conf.HTTPRegister != nil {
s.webRegistered = true
</s> add if !webRegistered && s.conf.HTTPRegister != nil {
webRegistered = true | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a | home/dns.go |
Context.stats.Start()
Context.queryLog.Start() | <mask> Context.dnsFilter.Start()
<mask> startFiltering()
<mask>
<mask> const topClientsNumber = 100 // the number of clients to get
<mask> topClients := Context.stats.GetTopClientsIP(topClientsNumber)
<mask> for _, ip := range topClients {
<mask> ipAddr := net.ParseIP(ip)
<mask> if !ipAddr.IsLoopback() {
</s> Merge: - install: recover from error on DNS server start
Close #1293
Squashed commit of the following:
commit 0981754c5c2c67f2567ee4af0d9ab24377c53413
Merge: ef81f2c8 a6d75118
Author: Simon Zolin <[email protected]>
Date: Thu Jan 16 14:19:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1293-install
commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 18:32:11 2019 +0300
linter
commit 9e205be53d9de25bd2ad63398644e14b09f95238
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 17:22:17 2019 +0300
- install: recover from error on DNS server start
Close all modules properly
Don't register HTTP handlers twice </s> remove if !s.webRegistered && s.conf.HTTPRegister != nil {
s.webRegistered = true
</s> add if !webRegistered && s.conf.HTTPRegister != nil {
webRegistered = true | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a | home/dns.go |
closeDNSServer()
return nil
}
func closeDNSServer() { | <mask> }
<mask>
<mask> // DNS forward module must be closed BEFORE stats or queryLog because it depends on them
<mask> if Context.dnsServer != nil {
<mask> Context.dnsServer.Close()
<mask> Context.dnsServer = nil
<mask> }
</s> Merge: - install: recover from error on DNS server start
Close #1293
Squashed commit of the following:
commit 0981754c5c2c67f2567ee4af0d9ab24377c53413
Merge: ef81f2c8 a6d75118
Author: Simon Zolin <[email protected]>
Date: Thu Jan 16 14:19:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1293-install
commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 18:32:11 2019 +0300
linter
commit 9e205be53d9de25bd2ad63398644e14b09f95238
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 17:22:17 2019 +0300
- install: recover from error on DNS server start
Close all modules properly
Don't register HTTP handlers twice </s> remove Context.dnsServer.Close()
</s> add if Context.dnsServer != nil {
Context.dnsServer.Close()
Context.dnsServer = nil
}
if Context.dnsFilter != nil {
Context.dnsFilter.Close()
Context.dnsFilter = nil
} </s> remove Context.dnsFilter.Close()
Context.dnsFilter = nil
</s> add if Context.stats != nil {
Context.stats.Close()
Context.stats = nil
} </s> remove return d
</s> add </s> remove if !s.webRegistered && s.conf.HTTPRegister != nil {
s.webRegistered = true
</s> add if !webRegistered && s.conf.HTTPRegister != nil {
webRegistered = true | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a | home/dns.go |
if Context.dnsServer != nil {
Context.dnsServer.Close()
Context.dnsServer = nil
}
if Context.dnsFilter != nil {
Context.dnsFilter.Close()
Context.dnsFilter = nil
} | <mask> return errorx.Decorate(err, "Couldn't stop forwarding DNS server")
<mask> }
<mask>
<mask> // DNS forward module must be closed BEFORE stats or queryLog because it depends on them
<mask> Context.dnsServer.Close()
<mask>
<mask> Context.dnsFilter.Close()
<mask> Context.dnsFilter = nil
<mask>
<mask> Context.stats.Close()
</s> Merge: - install: recover from error on DNS server start
Close #1293
Squashed commit of the following:
commit 0981754c5c2c67f2567ee4af0d9ab24377c53413
Merge: ef81f2c8 a6d75118
Author: Simon Zolin <[email protected]>
Date: Thu Jan 16 14:19:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1293-install
commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 18:32:11 2019 +0300
linter
commit 9e205be53d9de25bd2ad63398644e14b09f95238
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 17:22:17 2019 +0300
- install: recover from error on DNS server start
Close all modules properly
Don't register HTTP handlers twice </s> remove Context.dnsFilter.Close()
Context.dnsFilter = nil
</s> add if Context.stats != nil {
Context.stats.Close()
Context.stats = nil
} </s> remove Context.stats.Close()
Context.stats = nil
</s> add if Context.queryLog != nil {
Context.queryLog.Close()
Context.queryLog = nil
} </s> remove Context.queryLog.Close()
Context.queryLog = nil
</s> add if config.auth != nil {
config.auth.Close()
config.auth = nil
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a | home/dns.go |
if Context.stats != nil {
Context.stats.Close()
Context.stats = nil
} | <mask>
<mask> // DNS forward module must be closed BEFORE stats or queryLog because it depends on them
<mask> Context.dnsServer.Close()
<mask>
<mask> Context.dnsFilter.Close()
<mask> Context.dnsFilter = nil
<mask>
<mask> Context.stats.Close()
<mask> Context.stats = nil
<mask>
<mask> Context.queryLog.Close()
</s> Merge: - install: recover from error on DNS server start
Close #1293
Squashed commit of the following:
commit 0981754c5c2c67f2567ee4af0d9ab24377c53413
Merge: ef81f2c8 a6d75118
Author: Simon Zolin <[email protected]>
Date: Thu Jan 16 14:19:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1293-install
commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 18:32:11 2019 +0300
linter
commit 9e205be53d9de25bd2ad63398644e14b09f95238
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 17:22:17 2019 +0300
- install: recover from error on DNS server start
Close all modules properly
Don't register HTTP handlers twice </s> remove Context.dnsServer.Close()
</s> add if Context.dnsServer != nil {
Context.dnsServer.Close()
Context.dnsServer = nil
}
if Context.dnsFilter != nil {
Context.dnsFilter.Close()
Context.dnsFilter = nil
} </s> remove Context.stats.Close()
Context.stats = nil
</s> add if Context.queryLog != nil {
Context.queryLog.Close()
Context.queryLog = nil
} </s> remove Context.queryLog.Close()
Context.queryLog = nil
</s> add if config.auth != nil {
config.auth.Close()
config.auth = nil
} </s> remove config.auth.Close()
config.auth = nil
return nil
</s> add log.Debug("Closed all DNS modules") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a | home/dns.go |
if Context.queryLog != nil {
Context.queryLog.Close()
Context.queryLog = nil
} | <mask>
<mask> Context.dnsFilter.Close()
<mask> Context.dnsFilter = nil
<mask>
<mask> Context.stats.Close()
<mask> Context.stats = nil
<mask>
<mask> Context.queryLog.Close()
<mask> Context.queryLog = nil
<mask>
<mask> config.auth.Close()
</s> Merge: - install: recover from error on DNS server start
Close #1293
Squashed commit of the following:
commit 0981754c5c2c67f2567ee4af0d9ab24377c53413
Merge: ef81f2c8 a6d75118
Author: Simon Zolin <[email protected]>
Date: Thu Jan 16 14:19:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1293-install
commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 18:32:11 2019 +0300
linter
commit 9e205be53d9de25bd2ad63398644e14b09f95238
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 17:22:17 2019 +0300
- install: recover from error on DNS server start
Close all modules properly
Don't register HTTP handlers twice </s> remove Context.queryLog.Close()
Context.queryLog = nil
</s> add if config.auth != nil {
config.auth.Close()
config.auth = nil
} </s> remove Context.dnsFilter.Close()
Context.dnsFilter = nil
</s> add if Context.stats != nil {
Context.stats.Close()
Context.stats = nil
} </s> remove config.auth.Close()
config.auth = nil
return nil
</s> add log.Debug("Closed all DNS modules") </s> remove Context.dnsServer.Close()
</s> add if Context.dnsServer != nil {
Context.dnsServer.Close()
Context.dnsServer = nil
}
if Context.dnsFilter != nil {
Context.dnsFilter.Close()
Context.dnsFilter = nil
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a | home/dns.go |
if config.auth != nil {
config.auth.Close()
config.auth = nil
} | <mask>
<mask> Context.stats.Close()
<mask> Context.stats = nil
<mask>
<mask> Context.queryLog.Close()
<mask> Context.queryLog = nil
<mask>
<mask> config.auth.Close()
<mask> config.auth = nil
<mask> return nil
<mask> }
</s> Merge: - install: recover from error on DNS server start
Close #1293
Squashed commit of the following:
commit 0981754c5c2c67f2567ee4af0d9ab24377c53413
Merge: ef81f2c8 a6d75118
Author: Simon Zolin <[email protected]>
Date: Thu Jan 16 14:19:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1293-install
commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 18:32:11 2019 +0300
linter
commit 9e205be53d9de25bd2ad63398644e14b09f95238
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 17:22:17 2019 +0300
- install: recover from error on DNS server start
Close all modules properly
Don't register HTTP handlers twice </s> remove Context.stats.Close()
Context.stats = nil
</s> add if Context.queryLog != nil {
Context.queryLog.Close()
Context.queryLog = nil
} </s> remove config.auth.Close()
config.auth = nil
return nil
</s> add log.Debug("Closed all DNS modules") </s> remove Context.dnsFilter.Close()
Context.dnsFilter = nil
</s> add if Context.stats != nil {
Context.stats.Close()
Context.stats = nil
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a | home/dns.go |
log.Debug("Closed all DNS modules") | <mask>
<mask> Context.queryLog.Close()
<mask> Context.queryLog = nil
<mask>
<mask> config.auth.Close()
<mask> config.auth = nil
<mask> return nil
<mask> }
</s> Merge: - install: recover from error on DNS server start
Close #1293
Squashed commit of the following:
commit 0981754c5c2c67f2567ee4af0d9ab24377c53413
Merge: ef81f2c8 a6d75118
Author: Simon Zolin <[email protected]>
Date: Thu Jan 16 14:19:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1293-install
commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 18:32:11 2019 +0300
linter
commit 9e205be53d9de25bd2ad63398644e14b09f95238
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 17:22:17 2019 +0300
- install: recover from error on DNS server start
Close all modules properly
Don't register HTTP handlers twice </s> remove Context.queryLog.Close()
Context.queryLog = nil
</s> add if config.auth != nil {
config.auth.Close()
config.auth = nil
} </s> remove Context.stats.Close()
Context.stats = nil
</s> add if Context.queryLog != nil {
Context.queryLog.Close()
Context.queryLog = nil
} </s> remove Context.dnsFilter.Close()
Context.dnsFilter = nil
</s> add if Context.stats != nil {
Context.stats.Close()
Context.stats = nil
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a | home/dns.go |
return &l
}
func (l *queryLog) Start() { | <mask> if !checkInterval(l.conf.Interval) {
<mask> l.conf.Interval = 1
<mask> }
<mask> if l.conf.HTTPRegister != nil {
<mask> l.initWeb()
<mask> }
<mask> go l.periodicRotate()
<mask> }
<mask>
</s> Merge: - install: recover from error on DNS server start
Close #1293
Squashed commit of the following:
commit 0981754c5c2c67f2567ee4af0d9ab24377c53413
Merge: ef81f2c8 a6d75118
Author: Simon Zolin <[email protected]>
Date: Thu Jan 16 14:19:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1293-install
commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 18:32:11 2019 +0300
linter
commit 9e205be53d9de25bd2ad63398644e14b09f95238
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 17:22:17 2019 +0300
- install: recover from error on DNS server start
Close all modules properly
Don't register HTTP handlers twice </s> remove return &l
</s> add </s> remove if !s.webRegistered && s.conf.HTTPRegister != nil {
s.webRegistered = true
</s> add if !webRegistered && s.conf.HTTPRegister != nil {
webRegistered = true </s> remove Context.queryLog.Close()
Context.queryLog = nil
</s> add if config.auth != nil {
config.auth.Close()
config.auth = nil
} | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a | querylog/qlog.go |
<mask> if l.conf.HTTPRegister != nil {
<mask> l.initWeb()
<mask> }
<mask> go l.periodicRotate()
<mask> return &l
<mask> }
<mask>
<mask> func (l *queryLog) Close() {
<mask> _ = l.flushLogBuffer(true)
<mask> }
</s> Merge: - install: recover from error on DNS server start
Close #1293
Squashed commit of the following:
commit 0981754c5c2c67f2567ee4af0d9ab24377c53413
Merge: ef81f2c8 a6d75118
Author: Simon Zolin <[email protected]>
Date: Thu Jan 16 14:19:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1293-install
commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 18:32:11 2019 +0300
linter
commit 9e205be53d9de25bd2ad63398644e14b09f95238
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 17:22:17 2019 +0300
- install: recover from error on DNS server start
Close all modules properly
Don't register HTTP handlers twice </s> remove s.initWeb()
go s.periodicFlush()
</s> add </s> remove Context.queryLog.Close()
Context.queryLog = nil
</s> add if config.auth != nil {
config.auth.Close()
config.auth = nil
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a | querylog/qlog.go |
|
Start()
| <mask> }
<mask>
<mask> // QueryLog - main interface
<mask> type QueryLog interface {
<mask> // Close query log object
<mask> Close()
<mask>
<mask> // Add a log entry
</s> Merge: - install: recover from error on DNS server start
Close #1293
Squashed commit of the following:
commit 0981754c5c2c67f2567ee4af0d9ab24377c53413
Merge: ef81f2c8 a6d75118
Author: Simon Zolin <[email protected]>
Date: Thu Jan 16 14:19:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1293-install
commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 18:32:11 2019 +0300
linter
commit 9e205be53d9de25bd2ad63398644e14b09f95238
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 17:22:17 2019 +0300
- install: recover from error on DNS server start
Close all modules properly
Don't register HTTP handlers twice </s> remove return d
</s> add </s> remove return &l
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a | querylog/querylog.go |
Start()
| <mask> }
<mask>
<mask> // Stats - main interface
<mask> type Stats interface {
<mask> // Close object.
<mask> // This function is not thread safe
<mask> // (can't be called in parallel with any other function of this interface).
<mask> Close()
</s> Merge: - install: recover from error on DNS server start
Close #1293
Squashed commit of the following:
commit 0981754c5c2c67f2567ee4af0d9ab24377c53413
Merge: ef81f2c8 a6d75118
Author: Simon Zolin <[email protected]>
Date: Thu Jan 16 14:19:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1293-install
commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 18:32:11 2019 +0300
linter
commit 9e205be53d9de25bd2ad63398644e14b09f95238
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 17:22:17 2019 +0300
- install: recover from error on DNS server start
Close all modules properly
Don't register HTTP handlers twice </s> remove return d
</s> add </s> remove webRegistered bool
isRunning bool
</s> add isRunning bool | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a | stats/stats.go |
<mask> deserialize(&u, udb)
<mask> }
<mask> s.unit = &u
<mask>
<mask> s.initWeb()
<mask>
<mask> go s.periodicFlush()
<mask>
<mask> log.Debug("Stats: initialized")
<mask> return &s, nil
<mask> }
<mask>
<mask> func checkInterval(days uint32) bool {
</s> Merge: - install: recover from error on DNS server start
Close #1293
Squashed commit of the following:
commit 0981754c5c2c67f2567ee4af0d9ab24377c53413
Merge: ef81f2c8 a6d75118
Author: Simon Zolin <[email protected]>
Date: Thu Jan 16 14:19:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1293-install
commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 18:32:11 2019 +0300
linter
commit 9e205be53d9de25bd2ad63398644e14b09f95238
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 17:22:17 2019 +0300
- install: recover from error on DNS server start
Close all modules properly
Don't register HTTP handlers twice </s> remove return &l
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a | stats/stats_unit.go |
|
func (s *statsCtx) Start() {
s.initWeb()
go s.periodicFlush()
}
| <mask> log.Debug("Stats: initialized")
<mask> return &s, nil
<mask> }
<mask>
<mask> func checkInterval(days uint32) bool {
<mask> return days == 1 || days == 7 || days == 30 || days == 90
<mask> }
<mask>
<mask> func (s *statsCtx) dbOpen() bool {
<mask> var err error
</s> Merge: - install: recover from error on DNS server start
Close #1293
Squashed commit of the following:
commit 0981754c5c2c67f2567ee4af0d9ab24377c53413
Merge: ef81f2c8 a6d75118
Author: Simon Zolin <[email protected]>
Date: Thu Jan 16 14:19:20 2020 +0300
Merge remote-tracking branch 'origin/master' into 1293-install
commit ef81f2c886f3bfcff4e4352d7ecea6642be7d8e1
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 18:32:11 2019 +0300
linter
commit 9e205be53d9de25bd2ad63398644e14b09f95238
Author: Simon Zolin <[email protected]>
Date: Mon Dec 30 17:22:17 2019 +0300
- install: recover from error on DNS server start
Close all modules properly
Don't register HTTP handlers twice </s> remove s.initWeb()
go s.periodicFlush()
</s> add </s> remove if !s.webRegistered && s.conf.HTTPRegister != nil {
s.webRegistered = true
</s> add if !webRegistered && s.conf.HTTPRegister != nil {
webRegistered = true | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6563886b4909c0c0f2755122eef10060d01fe17a | stats/stats_unit.go |
'GO_VERSION': '1.19.6' | <mask> 'name': 'build'
<mask>
<mask> 'env':
<mask> 'GO_VERSION': '1.19.5'
<mask> 'NODE_VERSION': '14'
<mask>
<mask> 'on':
<mask> 'push':
<mask> 'branches':
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove 'GO_VERSION': '1.19.5'
</s> add 'GO_VERSION': '1.19.6' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove github.com/onsi/ginkgo/v2 v2.8.0 // indirect
</s> add github.com/onsi/ginkgo/v2 v2.8.1 // indirect </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f h1:dpx1PHxYqAnXzbryJrWP1NQLzEjwcVgFLhkknuFQ7ww=
</s> add | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | .github/workflows/build.yml |
'GO_VERSION': '1.19.6' | <mask> 'name': 'lint'
<mask>
<mask> 'env':
<mask> 'GO_VERSION': '1.19.5'
<mask>
<mask> 'on':
<mask> 'push':
<mask> 'tags':
<mask> - 'v*'
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove 'GO_VERSION': '1.19.5'
</s> add 'GO_VERSION': '1.19.6' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | .github/workflows/lint.yml |
'dockerGo': 'adguard/golang-ubuntu:6.1' | <mask> 'name': 'AdGuard Home - Build and publish release'
<mask> # Make sure to sync any changes with the branch overrides below.
<mask> 'variables':
<mask> 'channel': 'edge'
<mask> 'dockerGo': 'adguard/golang-ubuntu:6.0'
<mask>
<mask> 'stages':
<mask> - 'Build frontend':
<mask> 'manual': false
<mask> 'final': false
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove 'GO_VERSION': '1.19.5'
</s> add 'GO_VERSION': '1.19.6' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | bamboo-specs/release.yaml |
'dockerGo': 'adguard/golang-ubuntu:6.1' | <mask> # Set the default release channel on the release branch to beta, as we may
<mask> # need to build a few of these.
<mask> 'variables':
<mask> 'channel': 'beta'
<mask> 'dockerGo': 'adguard/golang-ubuntu:6.0'
<mask> # release-vX.Y.Z branches are the branches from which the actual final release
<mask> # is built.
<mask> - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
<mask> # Disable integration branches for release branches.
<mask> 'branch-config':
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | bamboo-specs/release.yaml |
'dockerGo': 'adguard/golang-ubuntu:6.1' | <mask> # Set the default release channel on the final branch to release, as these
<mask> # are the ones that actually get released.
<mask> 'variables':
<mask> 'channel': 'release'
<mask> 'dockerGo': 'adguard/golang-ubuntu:6.0'
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | bamboo-specs/release.yaml |
'dockerGo': 'adguard/golang-ubuntu:6.1' | <mask> 'project-key': 'AGH'
<mask> 'key': 'AHBRTSPECS'
<mask> 'name': 'AdGuard Home - Build and run tests'
<mask> 'variables':
<mask> 'dockerGo': 'adguard/golang-ubuntu:6.0'
<mask>
<mask> 'stages':
<mask> - 'Tests':
<mask> 'manual': false
<mask> 'final': false
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove 'GO_VERSION': '1.19.5'
</s> add 'GO_VERSION': '1.19.6' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.0'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.1' </s> remove 'GO_VERSION': '1.19.5'
</s> add 'GO_VERSION': '1.19.6' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | bamboo-specs/test.yaml |
<mask> "categoryId": "other",
<mask> "homepage": "https://github.com/DandelionSprout/adfilt",
<mask> "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_6.txt"
<mask> },
<mask> "energized_spark": {
<mask> "name": "Energized Spark",
<mask> "categoryId": "general",
<mask> "homepage": "https://energized.pro/",
<mask> "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_28.txt"
<mask> },
<mask> "hagezi_personal": {
<mask> "name": "HaGeZi Personal Black \u0026 White",
<mask> "categoryId": "general",
<mask> "homepage": "https://github.com/hagezi/dns-blocklists",
<mask> "source": "https://adguardteam.github.io/HostlistsRegistry/assets/filter_34.txt"
</s> Pull request 1737: upd-all
Merge in DNS/adguard-home from upd-all to master
Squashed commit of the following:
commit e89605e02c7a97ea6dc91cf65afd1d8d8aaedcb2
Author: Ainar Garipov <[email protected]>
Date: Wed Feb 15 14:16:54 2023 +0300
all: upd go, deps, i18n, flt lists </s> remove github.com/onsi/ginkgo/v2 v2.8.0 // indirect
</s> add github.com/onsi/ginkgo/v2 v2.8.1 // indirect </s> remove github.com/u-root/uio v0.0.0-20221213070652-c3537552635f h1:dpx1PHxYqAnXzbryJrWP1NQLzEjwcVgFLhkknuFQ7ww=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/6575c068b842d7e81addc39785c4c10dad248832 | client/src/helpers/filters/filters.js |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.