docstring_tokens
stringlengths 18
16.9k
| code_tokens
stringlengths 75
1.81M
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|
keep keep keep keep replace keep keep keep keep keep | <mask> // Context - a global context object
<mask> var Context homeContext
<mask>
<mask> // Main is the entry point
<mask> func Main(version string, channel string, armVer string) {
<mask> // Init update-related global variables
<mask> versionString = version
<mask> updateChannel = channel
<mask> ARMVersion = armVer
<mask> versionCheckURL = "https://static.adguard.com/adguardhome/" + updateChannel + "/version.json"
</s> Pull request:* all: fix all staticcheck simplification and unused warnings
Merge in DNS/adguard-home from 2270-fix-s-u-warnings to master
Squashed commit of the following:
commit 03e0f78bd471057007c2d4042ee26eda2bbc9b29
Merge: 50dc3ef5c 7e16fda57
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 6 11:54:09 2020 +0300
Merge branch 'master' into 2270-fix-s-u-warnings
commit 50dc3ef5c44a5fdc941794c26784b0c44d7b5aa0
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 19:48:54 2020 +0300
* all: improve code quality
commit d6d804f759ce3e47154a389b427550e72c4b9090
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 18:03:35 2020 +0300
* all: fix all staticcheck simplification and unused warnings
Closes #2270. </s> remove var blockingRules = "||example.org^\n"
var whitelistRules = "||example.org^\n@@||test.example.org\n"
var importantRules = "@@||example.org^\n||test.example.org^$important\n"
var regexRules = "/example\\.org/\n@@||test.example.org^\n"
var maskRules = "test*.example.org^\nexam*.com\n"
</s> add const nl = "\n"
const (
blockingRules = `||example.org^` + nl
whitelistRules = `||example.org^` + nl + `@@||test.example.org` + nl
importantRules = `@@||example.org^` + nl + `||test.example.org^$important` + nl
regexRules = `/example\.org/` + nl + `@@||test.example.org^` + nl
maskRules = `test*.example.org^` + nl + `exam*.com` + nl
) </s> remove func (w *Whois) query(target string, serverAddr string) (string, error) {
</s> add func (w *Whois) query(target, serverAddr string) (string, error) { </s> remove var exp []byte
exp = make([]byte, 4)
</s> add exp := make([]byte, 4) </s> remove // Process - get the list of IP addresses for the hostname
// Return nil if not found
</s> add // Process returns the list of IP addresses for the hostname or nil if nothing
// found. </s> remove var (
// DefaultServers is the address of all link-local DHCP servers and
// relay agents.
DefaultServers = &net.UDPAddr{
IP: net.IPv4bcast,
Port: ServerPort,
}
)
</s> add // DefaultServers is the address of all link-local DHCP servers and
// relay agents.
var DefaultServers = &net.UDPAddr{
IP: net.IPv4bcast,
Port: ServerPort,
} </s> remove func verifyCertChain(data *tlsConfigStatus, certChain string, serverName string) error {
</s> add func verifyCertChain(data *tlsConfigStatus, certChain, serverName string) error { | https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3 | internal/home/home.go |
keep keep keep keep replace replace replace replace replace keep keep keep keep keep | <mask> if !filepath.IsAbs(configfile) {
<mask> configfile = filepath.Join(Context.workDir, Context.configFilename)
<mask> }
<mask> _, err := os.Stat(configfile)
<mask> if !os.IsNotExist(err) {
<mask> // do nothing, file exists
<mask> return false
<mask> }
<mask> return true
<mask> }
<mask>
<mask> // Connect to a remote server resolving hostname using our own DNS server
<mask> func customDialContext(ctx context.Context, network, addr string) (net.Conn, error) {
<mask> log.Tracef("network:%v addr:%v", network, addr)
</s> Pull request:* all: fix all staticcheck simplification and unused warnings
Merge in DNS/adguard-home from 2270-fix-s-u-warnings to master
Squashed commit of the following:
commit 03e0f78bd471057007c2d4042ee26eda2bbc9b29
Merge: 50dc3ef5c 7e16fda57
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 6 11:54:09 2020 +0300
Merge branch 'master' into 2270-fix-s-u-warnings
commit 50dc3ef5c44a5fdc941794c26784b0c44d7b5aa0
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 19:48:54 2020 +0300
* all: improve code quality
commit d6d804f759ce3e47154a389b427550e72c4b9090
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 18:03:35 2020 +0300
* all: fix all staticcheck simplification and unused warnings
Closes #2270. </s> remove func (w *Whois) query(target string, serverAddr string) (string, error) {
</s> add func (w *Whois) query(target, serverAddr string) (string, error) { </s> remove // fileExists returns TRUE if file exists
</s> add // FileExists returns true if file exists. </s> remove if err != nil {
return false
}
return true
</s> add return err == nil </s> remove if err != nil {
return false
}
return true
</s> add return err == nil </s> remove // Return TRUE if file exists
</s> add // fileExists returns true if file exists. </s> remove // On OpenWrt we're using a different type of sysvScript
if util.IsOpenWrt() {
</s> add // On OpenWrt we're using a different type of sysvScript.
if util.IsOpenWRT() { | https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3 | internal/home/home.go |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> w.Header().Set("Content-Type", "text/plain")
<mask> log.Printf("config.Language is %s", config.Language)
<mask> _, err := fmt.Fprintf(w, "%s\n", config.Language)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("Unable to write response json: %s", err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, http.StatusInternalServerError)
<mask> return
<mask> }
<mask> }
<mask>
<mask> func handleI18nChangeLanguage(w http.ResponseWriter, r *http.Request) {
</s> Pull request:* all: fix all staticcheck simplification and unused warnings
Merge in DNS/adguard-home from 2270-fix-s-u-warnings to master
Squashed commit of the following:
commit 03e0f78bd471057007c2d4042ee26eda2bbc9b29
Merge: 50dc3ef5c 7e16fda57
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 6 11:54:09 2020 +0300
Merge branch 'master' into 2270-fix-s-u-warnings
commit 50dc3ef5c44a5fdc941794c26784b0c44d7b5aa0
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 19:48:54 2020 +0300
* all: improve code quality
commit d6d804f759ce3e47154a389b427550e72c4b9090
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 18:03:35 2020 +0300
* all: fix all staticcheck simplification and unused warnings
Closes #2270. </s> remove errorText := fmt.Sprintf("failed to read request body: %s", err)
log.Println(errorText)
http.Error(w, errorText, http.StatusBadRequest)
</s> add msg := fmt.Sprintf("failed to read request body: %s", err)
log.Println(msg)
http.Error(w, msg, http.StatusBadRequest) </s> remove errorText := fmt.Sprintf("failed to read request body: %s", err)
log.Error(errorText)
http.Error(w, errorText, http.StatusBadRequest)
</s> add msg := fmt.Sprintf("failed to read request body: %s", err)
log.Error(msg)
http.Error(w, msg, http.StatusBadRequest) </s> remove errorText := fmt.Sprintf("unknown language specified: %s", language)
log.Println(errorText)
http.Error(w, errorText, http.StatusBadRequest)
</s> add msg := fmt.Sprintf("unknown language specified: %s", language)
log.Println(msg)
http.Error(w, msg, http.StatusBadRequest) </s> remove errorText := fmt.Sprintf("empty language specified")
log.Println(errorText)
http.Error(w, errorText, http.StatusBadRequest)
</s> add msg := "empty language specified"
log.Println(msg)
http.Error(w, msg, http.StatusBadRequest) </s> remove func (d *Dnsfilter) checkMatchIP(t *testing.T, hostname string, ip string, qtype uint16) {
</s> add func (d *Dnsfilter) checkMatchIP(t *testing.T, hostname, ip string, qtype uint16) { </s> remove if err != nil {
return false
}
return true
</s> add return err == nil | https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3 | internal/home/i18n.go |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask>
<mask> func handleI18nChangeLanguage(w http.ResponseWriter, r *http.Request) {
<mask> body, err := ioutil.ReadAll(r.Body)
<mask> if err != nil {
<mask> errorText := fmt.Sprintf("failed to read request body: %s", err)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, http.StatusBadRequest)
<mask> return
<mask> }
<mask>
<mask> language := strings.TrimSpace(string(body))
<mask> if language == "" {
</s> Pull request:* all: fix all staticcheck simplification and unused warnings
Merge in DNS/adguard-home from 2270-fix-s-u-warnings to master
Squashed commit of the following:
commit 03e0f78bd471057007c2d4042ee26eda2bbc9b29
Merge: 50dc3ef5c 7e16fda57
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 6 11:54:09 2020 +0300
Merge branch 'master' into 2270-fix-s-u-warnings
commit 50dc3ef5c44a5fdc941794c26784b0c44d7b5aa0
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 19:48:54 2020 +0300
* all: improve code quality
commit d6d804f759ce3e47154a389b427550e72c4b9090
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 18:03:35 2020 +0300
* all: fix all staticcheck simplification and unused warnings
Closes #2270. </s> remove errorText := fmt.Sprintf("failed to read request body: %s", err)
log.Error(errorText)
http.Error(w, errorText, http.StatusBadRequest)
</s> add msg := fmt.Sprintf("failed to read request body: %s", err)
log.Error(msg)
http.Error(w, msg, http.StatusBadRequest) </s> remove errorText := fmt.Sprintf("empty language specified")
log.Println(errorText)
http.Error(w, errorText, http.StatusBadRequest)
</s> add msg := "empty language specified"
log.Println(msg)
http.Error(w, msg, http.StatusBadRequest) </s> remove errorText := fmt.Sprintf("Unable to write response json: %s", err)
log.Println(errorText)
http.Error(w, errorText, http.StatusInternalServerError)
</s> add msg := fmt.Sprintf("Unable to write response json: %s", err)
log.Println(msg)
http.Error(w, msg, http.StatusInternalServerError) </s> remove errorText := fmt.Sprintf("unknown language specified: %s", language)
log.Println(errorText)
http.Error(w, errorText, http.StatusBadRequest)
</s> add msg := fmt.Sprintf("unknown language specified: %s", language)
log.Println(msg)
http.Error(w, msg, http.StatusBadRequest) </s> remove errorText := fmt.Sprintf("empty interface name specified")
log.Error(errorText)
http.Error(w, errorText, http.StatusBadRequest)
</s> add msg := "empty interface name specified"
log.Error(msg)
http.Error(w, msg, http.StatusBadRequest) </s> remove s.db, err = bolt.Open(s.conf.Filename, 0644, nil)
</s> add s.db, err = bolt.Open(s.conf.Filename, 0o644, nil) | https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3 | internal/home/i18n.go |
keep replace replace replace keep keep keep replace replace replace keep | <mask> if language == "" {
<mask> errorText := fmt.Sprintf("empty language specified")
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, http.StatusBadRequest)
<mask> return
<mask> }
<mask> if !isLanguageAllowed(language) {
<mask> errorText := fmt.Sprintf("unknown language specified: %s", language)
<mask> log.Println(errorText)
<mask> http.Error(w, errorText, http.StatusBadRequest)
<mask> return
</s> Pull request:* all: fix all staticcheck simplification and unused warnings
Merge in DNS/adguard-home from 2270-fix-s-u-warnings to master
Squashed commit of the following:
commit 03e0f78bd471057007c2d4042ee26eda2bbc9b29
Merge: 50dc3ef5c 7e16fda57
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 6 11:54:09 2020 +0300
Merge branch 'master' into 2270-fix-s-u-warnings
commit 50dc3ef5c44a5fdc941794c26784b0c44d7b5aa0
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 19:48:54 2020 +0300
* all: improve code quality
commit d6d804f759ce3e47154a389b427550e72c4b9090
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 18:03:35 2020 +0300
* all: fix all staticcheck simplification and unused warnings
Closes #2270. </s> remove errorText := fmt.Sprintf("failed to read request body: %s", err)
log.Println(errorText)
http.Error(w, errorText, http.StatusBadRequest)
</s> add msg := fmt.Sprintf("failed to read request body: %s", err)
log.Println(msg)
http.Error(w, msg, http.StatusBadRequest) </s> remove errorText := fmt.Sprintf("empty interface name specified")
log.Error(errorText)
http.Error(w, errorText, http.StatusBadRequest)
</s> add msg := "empty interface name specified"
log.Error(msg)
http.Error(w, msg, http.StatusBadRequest) </s> remove errorText := fmt.Sprintf("failed to read request body: %s", err)
log.Error(errorText)
http.Error(w, errorText, http.StatusBadRequest)
</s> add msg := fmt.Sprintf("failed to read request body: %s", err)
log.Error(msg)
http.Error(w, msg, http.StatusBadRequest) </s> remove errorText := fmt.Sprintf("Unable to write response json: %s", err)
log.Println(errorText)
http.Error(w, errorText, http.StatusInternalServerError)
</s> add msg := fmt.Sprintf("Unable to write response json: %s", err)
log.Println(msg)
http.Error(w, msg, http.StatusInternalServerError) </s> remove q := ""
</s> add b := &strings.Builder{}
encoder := hex.NewEncoder(b)
| https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3 | internal/home/i18n.go |
keep keep keep keep replace replace replace replace replace replace replace keep keep keep | <mask> // periodically call "debug.FreeOSMemory" so
<mask> // that the OS could reclaim the free memory
<mask> go func() {
<mask> ticker := time.NewTicker(5 * time.Minute)
<mask> for {
<mask> select {
<mask> case t := <-ticker.C:
<mask> t.Second()
<mask> log.Debug("Free OS memory")
<mask> debug.FreeOSMemory()
<mask> }
<mask> }
<mask> }()
<mask> }
</s> Pull request:* all: fix all staticcheck simplification and unused warnings
Merge in DNS/adguard-home from 2270-fix-s-u-warnings to master
Squashed commit of the following:
commit 03e0f78bd471057007c2d4042ee26eda2bbc9b29
Merge: 50dc3ef5c 7e16fda57
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 6 11:54:09 2020 +0300
Merge branch 'master' into 2270-fix-s-u-warnings
commit 50dc3ef5c44a5fdc941794c26784b0c44d7b5aa0
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 19:48:54 2020 +0300
* all: improve code quality
commit d6d804f759ce3e47154a389b427550e72c4b9090
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 18:03:35 2020 +0300
* all: fix all staticcheck simplification and unused warnings
Closes #2270. </s> remove // MinInt - return the minimum value
func MinInt(a, b int) int {
if a < b {
return a
}
return b
}
// IsOpenWrt checks if OS is OpenWRT
func IsOpenWrt() bool {
</s> add // IsOpenWRT checks if OS is OpenWRT.
func IsOpenWRT() bool { </s> remove case _ = <-a.watcher.Events:
// skip this event
</s> add case <-a.watcher.Events:
// Skip this duplicating event </s> remove // updateLoop - read static hosts from system files
</s> add // updateLoop reads static hosts from system files. </s> remove // skip duplicate events
</s> add </s> remove for {
select {
case ok := <-a.updateChan:
if !ok {
log.Debug("Finished AutoHosts update loop")
return
}
a.updateHosts()
</s> add for ok := range a.updateChan {
if !ok {
log.Debug("Finished AutoHosts update loop")
return </s> remove
// IsFreeBSD checks if OS is FreeBSD
func IsFreeBSD() bool {
if runtime.GOOS == "freebsd" {
return true
}
return false
}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3 | internal/home/memory.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> // Wait for a signal and then synchronously resolve hostname by IP address
<mask> // Add the hostname:IP pair to "Clients" array
<mask> func (r *RDNS) workerLoop() {
<mask> for {
<mask> var ip string
<mask> ip = <-r.ipChannel
<mask>
<mask> host := r.resolve(ip)
<mask> if len(host) == 0 {
<mask> continue
<mask> }
</s> Pull request:* all: fix all staticcheck simplification and unused warnings
Merge in DNS/adguard-home from 2270-fix-s-u-warnings to master
Squashed commit of the following:
commit 03e0f78bd471057007c2d4042ee26eda2bbc9b29
Merge: 50dc3ef5c 7e16fda57
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 6 11:54:09 2020 +0300
Merge branch 'master' into 2270-fix-s-u-warnings
commit 50dc3ef5c44a5fdc941794c26784b0c44d7b5aa0
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 19:48:54 2020 +0300
* all: improve code quality
commit d6d804f759ce3e47154a389b427550e72c4b9090
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 18:03:35 2020 +0300
* all: fix all staticcheck simplification and unused warnings
Closes #2270. </s> remove var ip string
ip = <-w.ipChan
</s> add ip := <-w.ipChan </s> remove func ip6InRange(start net.IP, ip net.IP) bool {
</s> add func ip6InRange(start, ip net.IP) bool { </s> remove // Process - get the list of IP addresses for the hostname
// Return nil if not found
</s> add // Process returns the list of IP addresses for the hostname or nil if nothing
// found. </s> remove func (d *Dnsfilter) checkMatchIP(t *testing.T, hostname string, ip string, qtype uint16) {
</s> add func (d *Dnsfilter) checkMatchIP(t *testing.T, hostname, ip string, qtype uint16) { </s> remove q += fmt.Sprintf("%s.", hex.EncodeToString(hash[0:2]))
</s> add // Ignore errors, since strings.(*Buffer).Write never returns
// errors.
//
// TODO(e.burkov, a.garipov): Find out and document why exactly
// this slice.
_, _ = encoder.Write(hash[0:2])
_, _ = b.WriteRune('.') </s> remove q := ""
</s> add b := &strings.Builder{}
encoder := hex.NewEncoder(b)
| https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3 | internal/home/rdns.go |
keep keep keep keep replace keep keep keep keep keep | <mask> if err != nil {
<mask> log.Fatal(err)
<mask> }
<mask>
<mask> if util.IsOpenWrt() {
<mask> // On OpenWrt it is important to run enable after the service installation
<mask> // Otherwise, the service won't start on the system startup
<mask> _, err := runInitdCommand("enable")
<mask> if err != nil {
<mask> log.Fatal(err)
</s> Pull request:* all: fix all staticcheck simplification and unused warnings
Merge in DNS/adguard-home from 2270-fix-s-u-warnings to master
Squashed commit of the following:
commit 03e0f78bd471057007c2d4042ee26eda2bbc9b29
Merge: 50dc3ef5c 7e16fda57
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 6 11:54:09 2020 +0300
Merge branch 'master' into 2270-fix-s-u-warnings
commit 50dc3ef5c44a5fdc941794c26784b0c44d7b5aa0
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 19:48:54 2020 +0300
* all: improve code quality
commit d6d804f759ce3e47154a389b427550e72c4b9090
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 18:03:35 2020 +0300
* all: fix all staticcheck simplification and unused warnings
Closes #2270. </s> remove if util.IsOpenWrt() {
</s> add if util.IsOpenWRT() { </s> remove // Return TRUE if file exists
</s> add // fileExists returns true if file exists. </s> remove } else if util.IsFreeBSD() {
</s> add } else if runtime.GOOS == "freebsd" { </s> remove // On OpenWrt we're using a different type of sysvScript
if util.IsOpenWrt() {
</s> add // On OpenWrt we're using a different type of sysvScript.
if util.IsOpenWRT() { </s> remove // Use modified service file templates
</s> add // Use modified service file templates. </s> remove // fileExists returns TRUE if file exists
</s> add // FileExists returns true if file exists. | https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3 | internal/home/service.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> // handleServiceStatusCommand handles service "uninstall" command
<mask> func handleServiceUninstallCommand(s service.Service) {
<mask> if util.IsOpenWrt() {
<mask> // On OpenWrt it is important to run disable command first
<mask> // as it will remove the symlink
<mask> _, err := runInitdCommand("disable")
<mask> if err != nil {
<mask> log.Fatal(err)
</s> Pull request:* all: fix all staticcheck simplification and unused warnings
Merge in DNS/adguard-home from 2270-fix-s-u-warnings to master
Squashed commit of the following:
commit 03e0f78bd471057007c2d4042ee26eda2bbc9b29
Merge: 50dc3ef5c 7e16fda57
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 6 11:54:09 2020 +0300
Merge branch 'master' into 2270-fix-s-u-warnings
commit 50dc3ef5c44a5fdc941794c26784b0c44d7b5aa0
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 19:48:54 2020 +0300
* all: improve code quality
commit d6d804f759ce3e47154a389b427550e72c4b9090
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 18:03:35 2020 +0300
* all: fix all staticcheck simplification and unused warnings
Closes #2270. </s> remove if util.IsOpenWrt() {
</s> add if util.IsOpenWRT() { </s> remove } else if util.IsFreeBSD() {
</s> add } else if runtime.GOOS == "freebsd" { </s> remove if err != nil {
return false
}
return true
</s> add return err == nil </s> remove // On OpenWrt we're using a different type of sysvScript
if util.IsOpenWrt() {
</s> add // On OpenWrt we're using a different type of sysvScript.
if util.IsOpenWRT() { </s> remove // runCommand runs shell command
</s> add // RunCommand runs shell command. </s> remove // Return TRUE if file exists
</s> add // fileExists returns true if file exists. | https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3 | internal/home/service.go |
keep keep keep replace keep keep keep replace replace keep keep | <mask> // Redirect StdErr & StdOut to files.
<mask> c.Option["LogOutput"] = true
<mask>
<mask> // Use modified service file templates
<mask> c.Option["SystemdScript"] = systemdScript
<mask> c.Option["SysvScript"] = sysvScript
<mask>
<mask> // On OpenWrt we're using a different type of sysvScript
<mask> if util.IsOpenWrt() {
<mask> c.Option["SysvScript"] = openWrtScript
<mask> } else if util.IsFreeBSD() {
</s> Pull request:* all: fix all staticcheck simplification and unused warnings
Merge in DNS/adguard-home from 2270-fix-s-u-warnings to master
Squashed commit of the following:
commit 03e0f78bd471057007c2d4042ee26eda2bbc9b29
Merge: 50dc3ef5c 7e16fda57
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 6 11:54:09 2020 +0300
Merge branch 'master' into 2270-fix-s-u-warnings
commit 50dc3ef5c44a5fdc941794c26784b0c44d7b5aa0
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 19:48:54 2020 +0300
* all: improve code quality
commit d6d804f759ce3e47154a389b427550e72c4b9090
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 18:03:35 2020 +0300
* all: fix all staticcheck simplification and unused warnings
Closes #2270. </s> remove } else if util.IsFreeBSD() {
</s> add } else if runtime.GOOS == "freebsd" { </s> remove if util.IsOpenWrt() {
</s> add if util.IsOpenWRT() { </s> remove // it's difficult to update this file while it's being used.
</s> add // it's difficult to update this file while it's being
// used. </s> remove if util.IsOpenWrt() {
</s> add if util.IsOpenWRT() { </s> remove if !os.IsNotExist(err) {
// do nothing, file exists
return false
}
return true
</s> add return os.IsNotExist(err) | https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3 | internal/home/service.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> // On OpenWrt we're using a different type of sysvScript
<mask> if util.IsOpenWrt() {
<mask> c.Option["SysvScript"] = openWrtScript
<mask> } else if util.IsFreeBSD() {
<mask> c.Option["SysvScript"] = freeBSDScript
<mask> }
<mask> }
<mask>
<mask> // runInitdCommand runs init.d service command
</s> Pull request:* all: fix all staticcheck simplification and unused warnings
Merge in DNS/adguard-home from 2270-fix-s-u-warnings to master
Squashed commit of the following:
commit 03e0f78bd471057007c2d4042ee26eda2bbc9b29
Merge: 50dc3ef5c 7e16fda57
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 6 11:54:09 2020 +0300
Merge branch 'master' into 2270-fix-s-u-warnings
commit 50dc3ef5c44a5fdc941794c26784b0c44d7b5aa0
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 19:48:54 2020 +0300
* all: improve code quality
commit d6d804f759ce3e47154a389b427550e72c4b9090
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 18:03:35 2020 +0300
* all: fix all staticcheck simplification and unused warnings
Closes #2270. </s> remove // On OpenWrt we're using a different type of sysvScript
if util.IsOpenWrt() {
</s> add // On OpenWrt we're using a different type of sysvScript.
if util.IsOpenWRT() { </s> remove // Use modified service file templates
</s> add // Use modified service file templates. </s> remove if util.IsOpenWrt() {
</s> add if util.IsOpenWRT() { </s> remove if util.IsOpenWrt() {
</s> add if util.IsOpenWRT() { </s> remove // it's difficult to update this file while it's being used.
</s> add // it's difficult to update this file while it's being
// used. </s> remove // runCommand runs shell command
</s> add // RunCommand runs shell command. | https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3 | internal/home/service.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }()
<mask> }
<mask> }
<mask>
<mask> func verifyCertChain(data *tlsConfigStatus, certChain string, serverName string) error {
<mask> log.Tracef("TLS: got certificate: %d bytes", len(certChain))
<mask>
<mask> // now do a more extended validation
<mask> var certs []*pem.Block // PEM-encoded certificates
<mask>
</s> Pull request:* all: fix all staticcheck simplification and unused warnings
Merge in DNS/adguard-home from 2270-fix-s-u-warnings to master
Squashed commit of the following:
commit 03e0f78bd471057007c2d4042ee26eda2bbc9b29
Merge: 50dc3ef5c 7e16fda57
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 6 11:54:09 2020 +0300
Merge branch 'master' into 2270-fix-s-u-warnings
commit 50dc3ef5c44a5fdc941794c26784b0c44d7b5aa0
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 19:48:54 2020 +0300
* all: improve code quality
commit d6d804f759ce3e47154a389b427550e72c4b9090
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 18:03:35 2020 +0300
* all: fix all staticcheck simplification and unused warnings
Closes #2270. </s> remove if !os.IsNotExist(err) {
// do nothing, file exists
return false
}
return true
</s> add return os.IsNotExist(err) </s> remove func Main(version string, channel string, armVer string) {
</s> add func Main(version, channel, armVer string) { </s> remove if err != nil {
return false
}
return true
</s> add return err == nil </s> remove func (a *Auth) UserFind(login string, password string) User {
</s> add func (a *Auth) UserFind(login, password string) User { </s> remove func (w *Whois) query(target string, serverAddr string) (string, error) {
</s> add func (w *Whois) query(target, serverAddr string) (string, error) { </s> remove func check(t *testing.T, result bool, msg string) {
if !result {
t.Fatal(msg)
}
}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3 | internal/home/tls.go |
keep keep keep keep replace keep keep keep keep keep | <mask> parsedCerts = append(parsedCerts, parsed)
<mask> }
<mask>
<mask> if len(parsedCerts) == 0 {
<mask> data.WarningValidation = fmt.Sprintf("You have specified an empty certificate")
<mask> return errors.New(data.WarningValidation)
<mask> }
<mask>
<mask> data.ValidCert = true
<mask>
</s> Pull request:* all: fix all staticcheck simplification and unused warnings
Merge in DNS/adguard-home from 2270-fix-s-u-warnings to master
Squashed commit of the following:
commit 03e0f78bd471057007c2d4042ee26eda2bbc9b29
Merge: 50dc3ef5c 7e16fda57
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 6 11:54:09 2020 +0300
Merge branch 'master' into 2270-fix-s-u-warnings
commit 50dc3ef5c44a5fdc941794c26784b0c44d7b5aa0
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 19:48:54 2020 +0300
* all: improve code quality
commit d6d804f759ce3e47154a389b427550e72c4b9090
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 18:03:35 2020 +0300
* all: fix all staticcheck simplification and unused warnings
Closes #2270. </s> remove if IsOpenWrt() {
</s> add if IsOpenWRT() { </s> remove for _, it := range u.nResult {
udb.NResult = append(udb.NResult, it)
}
</s> add udb.NResult = append(udb.NResult, u.nResult...)
</s> remove if a[i].Count >= a[j].Count {
return true
}
return false
</s> add return a[j].Count < a[i].Count </s> remove if strings.Index(s, "<html") >= 0 ||
strings.Index(s, "<!doctype") >= 0 {
</s> add if strings.Contains(s, "<html") || strings.Contains(s, "<!doctype") { </s> remove ips, _ := a.table[host]
if len(ips) != 0 {
</s> add if ips, ok := a.table[host]; ok { </s> remove } else if util.IsFreeBSD() {
</s> add } else if runtime.GOOS == "freebsd" { | https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3 | internal/home/tls.go |
keep keep keep keep replace keep keep keep keep keep | <mask> return m
<mask> }
<mask>
<mask> // Send request to a server and receive the response
<mask> func (w *Whois) query(target string, serverAddr string) (string, error) {
<mask> addr, _, _ := net.SplitHostPort(serverAddr)
<mask> if addr == "whois.arin.net" {
<mask> target = "n + " + target
<mask> }
<mask> conn, err := customDialContext(context.TODO(), "tcp", serverAddr)
</s> Pull request:* all: fix all staticcheck simplification and unused warnings
Merge in DNS/adguard-home from 2270-fix-s-u-warnings to master
Squashed commit of the following:
commit 03e0f78bd471057007c2d4042ee26eda2bbc9b29
Merge: 50dc3ef5c 7e16fda57
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 6 11:54:09 2020 +0300
Merge branch 'master' into 2270-fix-s-u-warnings
commit 50dc3ef5c44a5fdc941794c26784b0c44d7b5aa0
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 19:48:54 2020 +0300
* all: improve code quality
commit d6d804f759ce3e47154a389b427550e72c4b9090
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 18:03:35 2020 +0300
* all: fix all staticcheck simplification and unused warnings
Closes #2270. </s> remove if !os.IsNotExist(err) {
// do nothing, file exists
return false
}
return true
</s> add return os.IsNotExist(err) </s> remove q += sbTXTSuffix
} else {
q += pcTXTSuffix
</s> add // See comment above.
_, _ = b.WriteString(sbTXTSuffix)
return b.String() </s> remove return q
</s> add // See comment above.
_, _ = b.WriteString(pcTXTSuffix)
return b.String() </s> remove if err != nil {
return false
}
return true
</s> add return err == nil </s> remove func Main(version string, channel string, armVer string) {
</s> add func Main(version, channel, armVer string) { </s> remove var ip string
ip = <-w.ipChan
</s> add ip := <-w.ipChan | https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3 | internal/home/whois.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask>
<mask> // Get IP address from channel; get WHOIS info; associate info with a client
<mask> func (w *Whois) workerLoop() {
<mask> for {
<mask> var ip string
<mask> ip = <-w.ipChan
<mask>
<mask> info := w.process(ip)
<mask> if len(info) == 0 {
<mask> continue
<mask> }
</s> Pull request:* all: fix all staticcheck simplification and unused warnings
Merge in DNS/adguard-home from 2270-fix-s-u-warnings to master
Squashed commit of the following:
commit 03e0f78bd471057007c2d4042ee26eda2bbc9b29
Merge: 50dc3ef5c 7e16fda57
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 6 11:54:09 2020 +0300
Merge branch 'master' into 2270-fix-s-u-warnings
commit 50dc3ef5c44a5fdc941794c26784b0c44d7b5aa0
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 19:48:54 2020 +0300
* all: improve code quality
commit d6d804f759ce3e47154a389b427550e72c4b9090
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 18:03:35 2020 +0300
* all: fix all staticcheck simplification and unused warnings
Closes #2270. </s> remove var ip string
ip = <-r.ipChannel
</s> add ip := <-r.ipChannel </s> remove func ip6InRange(start net.IP, ip net.IP) bool {
</s> add func ip6InRange(start, ip net.IP) bool { </s> remove func (w *Whois) query(target string, serverAddr string) (string, error) {
</s> add func (w *Whois) query(target, serverAddr string) (string, error) { </s> remove // Process - get the list of IP addresses for the hostname
// Return nil if not found
</s> add // Process returns the list of IP addresses for the hostname or nil if nothing
// found. </s> remove // updateLoop - read static hosts from system files
</s> add // updateLoop reads static hosts from system files. </s> remove func (d *Dnsfilter) checkMatchIP(t *testing.T, hostname string, ip string, qtype uint16) {
</s> add func (d *Dnsfilter) checkMatchIP(t *testing.T, hostname, ip string, qtype uint16) { | https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3 | internal/home/whois.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> "github.com/stretchr/testify/assert"
<mask> )
<mask>
<mask> func UIntArrayEquals(a []uint64, b []uint64) bool {
<mask> if len(a) != len(b) {
<mask> return false
<mask> }
<mask>
<mask> for i := range a {
</s> Pull request:* all: fix all staticcheck simplification and unused warnings
Merge in DNS/adguard-home from 2270-fix-s-u-warnings to master
Squashed commit of the following:
commit 03e0f78bd471057007c2d4042ee26eda2bbc9b29
Merge: 50dc3ef5c 7e16fda57
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 6 11:54:09 2020 +0300
Merge branch 'master' into 2270-fix-s-u-warnings
commit 50dc3ef5c44a5fdc941794c26784b0c44d7b5aa0
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 19:48:54 2020 +0300
* all: improve code quality
commit d6d804f759ce3e47154a389b427550e72c4b9090
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 18:03:35 2020 +0300
* all: fix all staticcheck simplification and unused warnings
Closes #2270. </s> remove // ContainsString checks if "v" is in the array "arr"
func ContainsString(arr []string, v string) bool {
for _, i := range arr {
if i == v {
</s> add // ContainsString checks if string is in the slice of strings.
func ContainsString(strs []string, str string) bool {
for _, s := range strs {
if s == str { </s> remove // MinInt - return the minimum value
func MinInt(a, b int) int {
if a < b {
return a
}
return b
}
// IsOpenWrt checks if OS is OpenWRT
func IsOpenWrt() bool {
</s> add // IsOpenWRT checks if OS is OpenWRT.
func IsOpenWRT() bool { </s> remove if a[i].Count >= a[j].Count {
return true
}
return false
</s> add return a[j].Count < a[i].Count </s> remove if err != nil {
return false
}
return true
</s> add return err == nil </s> remove func ip6InRange(start net.IP, ip net.IP) bool {
</s> add func ip6InRange(start, ip net.IP) bool { </s> remove func check(t *testing.T, result bool, msg string) {
if !result {
t.Fatal(msg)
}
}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3 | internal/stats/stats_test.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> os.Remove(conf.Filename)
<mask> }
<mask>
<mask> func TestLargeNumbers(t *testing.T) {
<mask> var hour int32
<mask> hour = 1
<mask> newID := func() uint32 {
<mask> // use "atomic" to make Go race detector happy
<mask> return uint32(atomic.LoadInt32(&hour))
<mask> }
<mask>
</s> Pull request:* all: fix all staticcheck simplification and unused warnings
Merge in DNS/adguard-home from 2270-fix-s-u-warnings to master
Squashed commit of the following:
commit 03e0f78bd471057007c2d4042ee26eda2bbc9b29
Merge: 50dc3ef5c 7e16fda57
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 6 11:54:09 2020 +0300
Merge branch 'master' into 2270-fix-s-u-warnings
commit 50dc3ef5c44a5fdc941794c26784b0c44d7b5aa0
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 19:48:54 2020 +0300
* all: improve code quality
commit d6d804f759ce3e47154a389b427550e72c4b9090
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 18:03:35 2020 +0300
* all: fix all staticcheck simplification and unused warnings
Closes #2270. </s> remove func _Func() string {
pc := make([]uintptr, 10) // at least 1 entry needed
runtime.Callers(2, pc)
f := runtime.FuncForPC(pc[0])
return path.Base(f.Name())
}
</s> add </s> remove /*
expire byte[4]
name_len byte[2]
name byte[]
*/
</s> add </s> remove func check(t *testing.T, result bool, msg string) {
if !result {
t.Fatal(msg)
}
}
</s> add </s> add func withBufferCap(n int) ClientOpt {
return func(c *Client) (err error) {
c.bufferCap = n
return
}
}
</s> remove for {
select {
case t := <-ticker.C:
t.Second()
log.Debug("Free OS memory")
debug.FreeOSMemory()
}
</s> add for range ticker.C {
log.Debug("free os memory")
debug.FreeOSMemory() </s> remove var ip string
ip = <-r.ipChannel
</s> add ip := <-r.ipChannel | https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3 | internal/stats/stats_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> func (s *statsCtx) dbOpen() bool {
<mask> var err error
<mask> log.Tracef("db.Open...")
<mask> s.db, err = bolt.Open(s.conf.Filename, 0644, nil)
<mask> if err != nil {
<mask> log.Error("Stats: open DB: %s: %s", s.conf.Filename, err)
<mask> if err.Error() == "invalid argument" {
<mask> log.Error("AdGuard Home cannot be initialized due to an incompatible file system.\nPlease read the explanation here: https://github.com/AdguardTeam/AdGuardHome/internal/wiki/Getting-Started#limitations")
<mask> }
</s> Pull request:* all: fix all staticcheck simplification and unused warnings
Merge in DNS/adguard-home from 2270-fix-s-u-warnings to master
Squashed commit of the following:
commit 03e0f78bd471057007c2d4042ee26eda2bbc9b29
Merge: 50dc3ef5c 7e16fda57
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 6 11:54:09 2020 +0300
Merge branch 'master' into 2270-fix-s-u-warnings
commit 50dc3ef5c44a5fdc941794c26784b0c44d7b5aa0
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 19:48:54 2020 +0300
* all: improve code quality
commit d6d804f759ce3e47154a389b427550e72c4b9090
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 18:03:35 2020 +0300
* all: fix all staticcheck simplification and unused warnings
Closes #2270. </s> remove errorText := fmt.Sprintf("failed to read request body: %s", err)
log.Error(errorText)
http.Error(w, errorText, http.StatusBadRequest)
</s> add msg := fmt.Sprintf("failed to read request body: %s", err)
log.Error(msg)
http.Error(w, msg, http.StatusBadRequest) </s> remove errorText := fmt.Sprintf("failed to read request body: %s", err)
log.Println(errorText)
http.Error(w, errorText, http.StatusBadRequest)
</s> add msg := fmt.Sprintf("failed to read request body: %s", err)
log.Println(msg)
http.Error(w, msg, http.StatusBadRequest) </s> remove // it's difficult to update this file while it's being used.
</s> add // it's difficult to update this file while it's being
// used. </s> remove func (d *Dnsfilter) checkMatchIP(t *testing.T, hostname string, ip string, qtype uint16) {
</s> add func (d *Dnsfilter) checkMatchIP(t *testing.T, hostname, ip string, qtype uint16) { </s> remove // fileExists returns TRUE if file exists
</s> add // FileExists returns true if file exists. </s> remove if err != nil {
return false
}
return true
</s> add return err == nil | https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3 | internal/stats/stats_unit.go |
keep keep keep keep replace replace replace replace keep keep keep keep keep | <mask> pair.Count = v
<mask> a = append(a, pair)
<mask> }
<mask> less := func(i, j int) bool {
<mask> if a[i].Count >= a[j].Count {
<mask> return true
<mask> }
<mask> return false
<mask> }
<mask> sort.Slice(a, less)
<mask> if max > len(a) {
<mask> max = len(a)
<mask> }
</s> Pull request:* all: fix all staticcheck simplification and unused warnings
Merge in DNS/adguard-home from 2270-fix-s-u-warnings to master
Squashed commit of the following:
commit 03e0f78bd471057007c2d4042ee26eda2bbc9b29
Merge: 50dc3ef5c 7e16fda57
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 6 11:54:09 2020 +0300
Merge branch 'master' into 2270-fix-s-u-warnings
commit 50dc3ef5c44a5fdc941794c26784b0c44d7b5aa0
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 19:48:54 2020 +0300
* all: improve code quality
commit d6d804f759ce3e47154a389b427550e72c4b9090
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 18:03:35 2020 +0300
* all: fix all staticcheck simplification and unused warnings
Closes #2270. </s> remove func UIntArrayEquals(a []uint64, b []uint64) bool {
</s> add func UIntArrayEquals(a, b []uint64) bool { </s> remove // ContainsString checks if "v" is in the array "arr"
func ContainsString(arr []string, v string) bool {
for _, i := range arr {
if i == v {
</s> add // ContainsString checks if string is in the slice of strings.
func ContainsString(strs []string, str string) bool {
for _, s := range strs {
if s == str { </s> remove // MinInt - return the minimum value
func MinInt(a, b int) int {
if a < b {
return a
}
return b
}
// IsOpenWrt checks if OS is OpenWRT
func IsOpenWrt() bool {
</s> add // IsOpenWRT checks if OS is OpenWRT.
func IsOpenWRT() bool { </s> remove if strings.Index(s, "<html") >= 0 ||
strings.Index(s, "<!doctype") >= 0 {
</s> add if strings.Contains(s, "<html") || strings.Contains(s, "<!doctype") { </s> remove // fileExists returns TRUE if file exists
</s> add // FileExists returns true if file exists. </s> remove
// IsFreeBSD checks if OS is FreeBSD
func IsFreeBSD() bool {
if runtime.GOOS == "freebsd" {
return true
}
return false
}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3 | internal/stats/stats_unit.go |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask>
<mask> func serialize(u *unit) *unitDB {
<mask> udb := unitDB{}
<mask> udb.NTotal = u.nTotal
<mask> for _, it := range u.nResult {
<mask> udb.NResult = append(udb.NResult, it)
<mask> }
<mask> if u.nTotal != 0 {
<mask> udb.TimeAvg = uint32(u.timeSum / u.nTotal)
<mask> }
<mask> udb.Domains = convertMapToArray(u.domains, maxDomains)
<mask> udb.BlockedDomains = convertMapToArray(u.blockedDomains, maxDomains)
</s> Pull request:* all: fix all staticcheck simplification and unused warnings
Merge in DNS/adguard-home from 2270-fix-s-u-warnings to master
Squashed commit of the following:
commit 03e0f78bd471057007c2d4042ee26eda2bbc9b29
Merge: 50dc3ef5c 7e16fda57
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 6 11:54:09 2020 +0300
Merge branch 'master' into 2270-fix-s-u-warnings
commit 50dc3ef5c44a5fdc941794c26784b0c44d7b5aa0
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 19:48:54 2020 +0300
* all: improve code quality
commit d6d804f759ce3e47154a389b427550e72c4b9090
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 18:03:35 2020 +0300
* all: fix all staticcheck simplification and unused warnings
Closes #2270. </s> add func withBufferCap(n int) ClientOpt {
return func(c *Client) (err error) {
c.bufferCap = n
return
}
}
</s> remove ips, _ := a.table[host]
if len(ips) != 0 {
</s> add if ips, ok := a.table[host]; ok { </s> remove if IsOpenWrt() {
</s> add if IsOpenWRT() { </s> remove func _Func() string {
pc := make([]uintptr, 10) // at least 1 entry needed
runtime.Callers(2, pc)
f := runtime.FuncForPC(pc[0])
return path.Base(f.Name())
}
</s> add </s> remove if strings.Index(s, "<html") >= 0 ||
strings.Index(s, "<!doctype") >= 0 {
</s> add if strings.Contains(s, "<html") || strings.Contains(s, "<!doctype") { </s> remove var ip string
ip = <-w.ipChan
</s> add ip := <-w.ipChan | https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3 | internal/stats/stats_unit.go |
keep keep keep keep replace keep keep keep keep keep | <mask> curUnit := serialize(s.unit)
<mask> curID := s.unit.id
<mask> s.unitLock.Unlock()
<mask>
<mask> units := []*unitDB{} //per-hour units
<mask> firstID := curID - limit + 1
<mask> for i := firstID; i != curID; i++ {
<mask> u := s.loadUnitFromDB(tx, i)
<mask> if u == nil {
<mask> u = &unitDB{}
</s> Pull request:* all: fix all staticcheck simplification and unused warnings
Merge in DNS/adguard-home from 2270-fix-s-u-warnings to master
Squashed commit of the following:
commit 03e0f78bd471057007c2d4042ee26eda2bbc9b29
Merge: 50dc3ef5c 7e16fda57
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 6 11:54:09 2020 +0300
Merge branch 'master' into 2270-fix-s-u-warnings
commit 50dc3ef5c44a5fdc941794c26784b0c44d7b5aa0
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 19:48:54 2020 +0300
* all: improve code quality
commit d6d804f759ce3e47154a389b427550e72c4b9090
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 18:03:35 2020 +0300
* all: fix all staticcheck simplification and unused warnings
Closes #2270. </s> remove m := make(map[string]string, 0)
</s> add m := make(map[string]string) </s> remove func (a *Auth) UserFind(login string, password string) User {
</s> add func (a *Auth) UserFind(login, password string) User { </s> remove // ContainsString checks if "v" is in the array "arr"
func ContainsString(arr []string, v string) bool {
for _, i := range arr {
if i == v {
</s> add // ContainsString checks if string is in the slice of strings.
func ContainsString(strs []string, str string) bool {
for _, s := range strs {
if s == str { </s> remove func UIntArrayEquals(a []uint64, b []uint64) bool {
</s> add func UIntArrayEquals(a, b []uint64) bool { </s> remove func _Func() string {
pc := make([]uintptr, 10) // at least 1 entry needed
runtime.Callers(2, pc)
f := runtime.FuncForPC(pc[0])
return path.Base(f.Name())
}
</s> add </s> remove if err != nil {
return false
}
return true
</s> add return err == nil | https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3 | internal/stats/stats_unit.go |
keep keep keep keep replace keep keep keep keep keep | <mask> if len(hostsFn) != 0 {
<mask> a.hostsFn = hostsFn
<mask> }
<mask>
<mask> if IsOpenWrt() {
<mask> a.hostsDirs = append(a.hostsDirs, "/tmp/hosts") // OpenWRT: "/tmp/hosts/dhcp.cfg01411c"
<mask> }
<mask>
<mask> // Load hosts initially
<mask> a.updateHosts()
</s> Pull request:* all: fix all staticcheck simplification and unused warnings
Merge in DNS/adguard-home from 2270-fix-s-u-warnings to master
Squashed commit of the following:
commit 03e0f78bd471057007c2d4042ee26eda2bbc9b29
Merge: 50dc3ef5c 7e16fda57
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 6 11:54:09 2020 +0300
Merge branch 'master' into 2270-fix-s-u-warnings
commit 50dc3ef5c44a5fdc941794c26784b0c44d7b5aa0
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 19:48:54 2020 +0300
* all: improve code quality
commit d6d804f759ce3e47154a389b427550e72c4b9090
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 18:03:35 2020 +0300
* all: fix all staticcheck simplification and unused warnings
Closes #2270. </s> remove for {
select {
case ok := <-a.updateChan:
if !ok {
log.Debug("Finished AutoHosts update loop")
return
}
a.updateHosts()
</s> add for ok := range a.updateChan {
if !ok {
log.Debug("Finished AutoHosts update loop")
return </s> add a.updateHosts() </s> remove // MinInt - return the minimum value
func MinInt(a, b int) int {
if a < b {
return a
}
return b
}
// IsOpenWrt checks if OS is OpenWRT
func IsOpenWrt() bool {
</s> add // IsOpenWRT checks if OS is OpenWRT.
func IsOpenWRT() bool { </s> remove // updateLoop - read static hosts from system files
</s> add // updateLoop reads static hosts from system files. </s> remove } else if util.IsFreeBSD() {
</s> add } else if runtime.GOOS == "freebsd" { </s> remove // On OpenWrt we're using a different type of sysvScript
if util.IsOpenWrt() {
</s> add // On OpenWrt we're using a different type of sysvScript.
if util.IsOpenWRT() { | https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3 | internal/util/auto_hosts.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> _ = a.watcher.Close()
<mask> }
<mask> }
<mask>
<mask> // Process - get the list of IP addresses for the hostname
<mask> // Return nil if not found
<mask> func (a *AutoHosts) Process(host string, qtype uint16) []net.IP {
<mask> if qtype == dns.TypePTR {
<mask> return nil
<mask> }
<mask>
</s> Pull request:* all: fix all staticcheck simplification and unused warnings
Merge in DNS/adguard-home from 2270-fix-s-u-warnings to master
Squashed commit of the following:
commit 03e0f78bd471057007c2d4042ee26eda2bbc9b29
Merge: 50dc3ef5c 7e16fda57
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 6 11:54:09 2020 +0300
Merge branch 'master' into 2270-fix-s-u-warnings
commit 50dc3ef5c44a5fdc941794c26784b0c44d7b5aa0
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 19:48:54 2020 +0300
* all: improve code quality
commit d6d804f759ce3e47154a389b427550e72c4b9090
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 18:03:35 2020 +0300
* all: fix all staticcheck simplification and unused warnings
Closes #2270. </s> remove func (d *Dnsfilter) checkMatchIP(t *testing.T, hostname string, ip string, qtype uint16) {
</s> add func (d *Dnsfilter) checkMatchIP(t *testing.T, hostname, ip string, qtype uint16) { </s> remove // updateLoop - read static hosts from system files
</s> add // updateLoop reads static hosts from system files. </s> remove for {
select {
case ok := <-a.updateChan:
if !ok {
log.Debug("Finished AutoHosts update loop")
return
}
a.updateHosts()
</s> add for ok := range a.updateChan {
if !ok {
log.Debug("Finished AutoHosts update loop")
return </s> remove var ip string
ip = <-r.ipChannel
</s> add ip := <-r.ipChannel </s> remove func (a *Auth) UserFind(login string, password string) User {
</s> add func (a *Auth) UserFind(login, password string) User { </s> add a.updateHosts() | https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3 | internal/util/auto_hosts.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> }
<mask>
<mask> var ipsCopy []net.IP
<mask> a.lock.Lock()
<mask> ips, _ := a.table[host]
<mask> if len(ips) != 0 {
<mask> ipsCopy = make([]net.IP, len(ips))
<mask> copy(ipsCopy, ips)
<mask> }
<mask> a.lock.Unlock()
<mask>
</s> Pull request:* all: fix all staticcheck simplification and unused warnings
Merge in DNS/adguard-home from 2270-fix-s-u-warnings to master
Squashed commit of the following:
commit 03e0f78bd471057007c2d4042ee26eda2bbc9b29
Merge: 50dc3ef5c 7e16fda57
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 6 11:54:09 2020 +0300
Merge branch 'master' into 2270-fix-s-u-warnings
commit 50dc3ef5c44a5fdc941794c26784b0c44d7b5aa0
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 19:48:54 2020 +0300
* all: improve code quality
commit d6d804f759ce3e47154a389b427550e72c4b9090
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 18:03:35 2020 +0300
* all: fix all staticcheck simplification and unused warnings
Closes #2270. </s> remove func (a *Auth) UserFind(login string, password string) User {
</s> add func (a *Auth) UserFind(login, password string) User { </s> remove if IsOpenWrt() {
</s> add if IsOpenWRT() { </s> remove for _, it := range u.nResult {
udb.NResult = append(udb.NResult, it)
}
</s> add udb.NResult = append(udb.NResult, u.nResult...)
</s> remove // Process - get the list of IP addresses for the hostname
// Return nil if not found
</s> add // Process returns the list of IP addresses for the hostname or nil if nothing
// found. </s> remove if strings.Index(s, "<html") >= 0 ||
strings.Index(s, "<!doctype") >= 0 {
</s> add if strings.Contains(s, "<html") || strings.Contains(s, "<!doctype") { </s> remove var ip string
ip = <-w.ipChan
</s> add ip := <-w.ipChan | https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3 | internal/util/auto_hosts.go |
keep keep replace keep keep keep replace replace keep | <mask> }
<mask>
<mask> // skip duplicate events
<mask> repeat := true
<mask> for repeat {
<mask> select {
<mask> case _ = <-a.watcher.Events:
<mask> // skip this event
<mask> default:
</s> Pull request:* all: fix all staticcheck simplification and unused warnings
Merge in DNS/adguard-home from 2270-fix-s-u-warnings to master
Squashed commit of the following:
commit 03e0f78bd471057007c2d4042ee26eda2bbc9b29
Merge: 50dc3ef5c 7e16fda57
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 6 11:54:09 2020 +0300
Merge branch 'master' into 2270-fix-s-u-warnings
commit 50dc3ef5c44a5fdc941794c26784b0c44d7b5aa0
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 19:48:54 2020 +0300
* all: improve code quality
commit d6d804f759ce3e47154a389b427550e72c4b9090
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 18:03:35 2020 +0300
* all: fix all staticcheck simplification and unused warnings
Closes #2270. </s> remove // updateLoop - read static hosts from system files
</s> add // updateLoop reads static hosts from system files. </s> remove for {
select {
case t := <-ticker.C:
t.Second()
log.Debug("Free OS memory")
debug.FreeOSMemory()
}
</s> add for range ticker.C {
log.Debug("free os memory")
debug.FreeOSMemory() </s> remove q += fmt.Sprintf("%s.", hex.EncodeToString(hash[0:2]))
</s> add // Ignore errors, since strings.(*Buffer).Write never returns
// errors.
//
// TODO(e.burkov, a.garipov): Find out and document why exactly
// this slice.
_, _ = encoder.Write(hash[0:2])
_, _ = b.WriteRune('.') </s> remove for {
select {
case ok := <-a.updateChan:
if !ok {
log.Debug("Finished AutoHosts update loop")
return
}
a.updateHosts()
</s> add for ok := range a.updateChan {
if !ok {
log.Debug("Finished AutoHosts update loop")
return </s> remove q += sbTXTSuffix
} else {
q += pcTXTSuffix
</s> add // See comment above.
_, _ = b.WriteString(sbTXTSuffix)
return b.String() | https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3 | internal/util/auto_hosts.go |
keep replace keep replace replace replace replace replace replace replace replace replace | <mask>
<mask> // updateLoop - read static hosts from system files
<mask> func (a *AutoHosts) updateLoop() {
<mask> for {
<mask> select {
<mask> case ok := <-a.updateChan:
<mask> if !ok {
<mask> log.Debug("Finished AutoHosts update loop")
<mask> return
<mask> }
<mask>
<mask> a.updateHosts()
</s> Pull request:* all: fix all staticcheck simplification and unused warnings
Merge in DNS/adguard-home from 2270-fix-s-u-warnings to master
Squashed commit of the following:
commit 03e0f78bd471057007c2d4042ee26eda2bbc9b29
Merge: 50dc3ef5c 7e16fda57
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 6 11:54:09 2020 +0300
Merge branch 'master' into 2270-fix-s-u-warnings
commit 50dc3ef5c44a5fdc941794c26784b0c44d7b5aa0
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 19:48:54 2020 +0300
* all: improve code quality
commit d6d804f759ce3e47154a389b427550e72c4b9090
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 18:03:35 2020 +0300
* all: fix all staticcheck simplification and unused warnings
Closes #2270. </s> add a.updateHosts() </s> remove // skip duplicate events
</s> add </s> remove if IsOpenWrt() {
</s> add if IsOpenWRT() { </s> remove // Process - get the list of IP addresses for the hostname
// Return nil if not found
</s> add // Process returns the list of IP addresses for the hostname or nil if nothing
// found. </s> remove func (a *Auth) UserFind(login string, password string) User {
</s> add func (a *Auth) UserFind(login, password string) User { | https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3 | internal/util/auto_hosts.go |
keep keep add keep keep keep keep keep | <mask> log.Debug("Finished AutoHosts update loop")
<mask> return
<mask> }
<mask> }
<mask> }
<mask>
<mask> // updateHosts - loads system hosts
<mask> func (a *AutoHosts) updateHosts() {
</s> Pull request:* all: fix all staticcheck simplification and unused warnings
Merge in DNS/adguard-home from 2270-fix-s-u-warnings to master
Squashed commit of the following:
commit 03e0f78bd471057007c2d4042ee26eda2bbc9b29
Merge: 50dc3ef5c 7e16fda57
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 6 11:54:09 2020 +0300
Merge branch 'master' into 2270-fix-s-u-warnings
commit 50dc3ef5c44a5fdc941794c26784b0c44d7b5aa0
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 19:48:54 2020 +0300
* all: improve code quality
commit d6d804f759ce3e47154a389b427550e72c4b9090
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 18:03:35 2020 +0300
* all: fix all staticcheck simplification and unused warnings
Closes #2270. </s> remove for {
select {
case ok := <-a.updateChan:
if !ok {
log.Debug("Finished AutoHosts update loop")
return
}
a.updateHosts()
</s> add for ok := range a.updateChan {
if !ok {
log.Debug("Finished AutoHosts update loop")
return </s> remove // updateLoop - read static hosts from system files
</s> add // updateLoop reads static hosts from system files. </s> remove // Process - get the list of IP addresses for the hostname
// Return nil if not found
</s> add // Process returns the list of IP addresses for the hostname or nil if nothing
// found. </s> remove func (a *Auth) UserFind(login string, password string) User {
</s> add func (a *Auth) UserFind(login, password string) User { </s> remove // MinInt - return the minimum value
func MinInt(a, b int) int {
if a < b {
return a
}
return b
}
// IsOpenWrt checks if OS is OpenWRT
func IsOpenWrt() bool {
</s> add // IsOpenWRT checks if OS is OpenWRT.
func IsOpenWRT() bool { </s> remove if IsOpenWrt() {
</s> add if IsOpenWRT() { | https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3 | internal/util/auto_hosts.go |
keep keep keep keep replace replace replace replace keep keep keep keep keep | <mask> "runtime"
<mask> "strings"
<mask> )
<mask>
<mask> // ContainsString checks if "v" is in the array "arr"
<mask> func ContainsString(arr []string, v string) bool {
<mask> for _, i := range arr {
<mask> if i == v {
<mask> return true
<mask> }
<mask> }
<mask> return false
<mask> }
</s> Pull request:* all: fix all staticcheck simplification and unused warnings
Merge in DNS/adguard-home from 2270-fix-s-u-warnings to master
Squashed commit of the following:
commit 03e0f78bd471057007c2d4042ee26eda2bbc9b29
Merge: 50dc3ef5c 7e16fda57
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 6 11:54:09 2020 +0300
Merge branch 'master' into 2270-fix-s-u-warnings
commit 50dc3ef5c44a5fdc941794c26784b0c44d7b5aa0
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 19:48:54 2020 +0300
* all: improve code quality
commit d6d804f759ce3e47154a389b427550e72c4b9090
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 18:03:35 2020 +0300
* all: fix all staticcheck simplification and unused warnings
Closes #2270. </s> remove func UIntArrayEquals(a []uint64, b []uint64) bool {
</s> add func UIntArrayEquals(a, b []uint64) bool { </s> remove
// IsFreeBSD checks if OS is FreeBSD
func IsFreeBSD() bool {
if runtime.GOOS == "freebsd" {
return true
}
return false
}
</s> add </s> remove // MinInt - return the minimum value
func MinInt(a, b int) int {
if a < b {
return a
}
return b
}
// IsOpenWrt checks if OS is OpenWRT
func IsOpenWrt() bool {
</s> add // IsOpenWRT checks if OS is OpenWRT.
func IsOpenWRT() bool { </s> remove if err != nil {
return false
}
return true
</s> add return err == nil </s> remove if a[i].Count >= a[j].Count {
return true
}
return false
</s> add return a[j].Count < a[i].Count </s> remove // fileExists returns TRUE if file exists
</s> add // FileExists returns true if file exists. | https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3 | internal/util/helpers.go |
keep replace keep keep replace replace replace replace | <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
<mask> }
<mask> return true
</s> Pull request:* all: fix all staticcheck simplification and unused warnings
Merge in DNS/adguard-home from 2270-fix-s-u-warnings to master
Squashed commit of the following:
commit 03e0f78bd471057007c2d4042ee26eda2bbc9b29
Merge: 50dc3ef5c 7e16fda57
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 6 11:54:09 2020 +0300
Merge branch 'master' into 2270-fix-s-u-warnings
commit 50dc3ef5c44a5fdc941794c26784b0c44d7b5aa0
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 19:48:54 2020 +0300
* all: improve code quality
commit d6d804f759ce3e47154a389b427550e72c4b9090
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 18:03:35 2020 +0300
* all: fix all staticcheck simplification and unused warnings
Closes #2270. </s> remove // Return TRUE if file exists
</s> add // fileExists returns true if file exists. </s> remove if err != nil {
return false
}
return true
</s> add return err == nil </s> remove if !os.IsNotExist(err) {
// do nothing, file exists
return false
}
return true
</s> add return os.IsNotExist(err) </s> remove // ContainsString checks if "v" is in the array "arr"
func ContainsString(arr []string, v string) bool {
for _, i := range arr {
if i == v {
</s> add // ContainsString checks if string is in the slice of strings.
func ContainsString(strs []string, str string) bool {
for _, s := range strs {
if s == str { </s> remove // MinInt - return the minimum value
func MinInt(a, b int) int {
if a < b {
return a
}
return b
}
// IsOpenWrt checks if OS is OpenWRT
func IsOpenWrt() bool {
</s> add // IsOpenWRT checks if OS is OpenWRT.
func IsOpenWRT() bool { | https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3 | internal/util/helpers.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask> return true
<mask> }
<mask>
<mask> // runCommand runs shell command
<mask> func RunCommand(command string, arguments ...string) (int, string, error) {
<mask> cmd := exec.Command(command, arguments...)
<mask> out, err := cmd.Output()
<mask> if err != nil {
<mask> return 1, "", fmt.Errorf("exec.Command(%s) failed: %v: %s", command, err, string(out))
</s> Pull request:* all: fix all staticcheck simplification and unused warnings
Merge in DNS/adguard-home from 2270-fix-s-u-warnings to master
Squashed commit of the following:
commit 03e0f78bd471057007c2d4042ee26eda2bbc9b29
Merge: 50dc3ef5c 7e16fda57
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 6 11:54:09 2020 +0300
Merge branch 'master' into 2270-fix-s-u-warnings
commit 50dc3ef5c44a5fdc941794c26784b0c44d7b5aa0
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 19:48:54 2020 +0300
* all: improve code quality
commit d6d804f759ce3e47154a389b427550e72c4b9090
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 18:03:35 2020 +0300
* all: fix all staticcheck simplification and unused warnings
Closes #2270. </s> remove if err != nil {
return false
}
return true
</s> add return err == nil </s> remove func (d *Dnsfilter) checkMatchIP(t *testing.T, hostname string, ip string, qtype uint16) {
</s> add func (d *Dnsfilter) checkMatchIP(t *testing.T, hostname, ip string, qtype uint16) { </s> remove if err != nil {
return false
}
return true
</s> add return err == nil </s> remove if util.IsOpenWrt() {
</s> add if util.IsOpenWRT() { </s> remove // fileExists returns TRUE if file exists
</s> add // FileExists returns true if file exists. </s> remove func (w *Whois) query(target string, serverAddr string) (string, error) {
</s> add func (w *Whois) query(target, serverAddr string) (string, error) { | https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3 | internal/util/helpers.go |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> }
<mask> return strings.TrimSpace(s)
<mask> }
<mask>
<mask> // MinInt - return the minimum value
<mask> func MinInt(a, b int) int {
<mask> if a < b {
<mask> return a
<mask> }
<mask> return b
<mask> }
<mask>
<mask> // IsOpenWrt checks if OS is OpenWRT
<mask> func IsOpenWrt() bool {
<mask> if runtime.GOOS != "linux" {
<mask> return false
<mask> }
<mask>
<mask> body, err := ioutil.ReadFile("/etc/os-release")
</s> Pull request:* all: fix all staticcheck simplification and unused warnings
Merge in DNS/adguard-home from 2270-fix-s-u-warnings to master
Squashed commit of the following:
commit 03e0f78bd471057007c2d4042ee26eda2bbc9b29
Merge: 50dc3ef5c 7e16fda57
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 6 11:54:09 2020 +0300
Merge branch 'master' into 2270-fix-s-u-warnings
commit 50dc3ef5c44a5fdc941794c26784b0c44d7b5aa0
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 19:48:54 2020 +0300
* all: improve code quality
commit d6d804f759ce3e47154a389b427550e72c4b9090
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 18:03:35 2020 +0300
* all: fix all staticcheck simplification and unused warnings
Closes #2270. </s> remove func UIntArrayEquals(a []uint64, b []uint64) bool {
</s> add func UIntArrayEquals(a, b []uint64) bool { </s> remove
// IsFreeBSD checks if OS is FreeBSD
func IsFreeBSD() bool {
if runtime.GOOS == "freebsd" {
return true
}
return false
}
</s> add </s> remove // ContainsString checks if "v" is in the array "arr"
func ContainsString(arr []string, v string) bool {
for _, i := range arr {
if i == v {
</s> add // ContainsString checks if string is in the slice of strings.
func ContainsString(strs []string, str string) bool {
for _, s := range strs {
if s == str { </s> remove if a[i].Count >= a[j].Count {
return true
}
return false
</s> add return a[j].Count < a[i].Count </s> remove // fileExists returns TRUE if file exists
</s> add // FileExists returns true if file exists. </s> remove q := ""
</s> add b := &strings.Builder{}
encoder := hex.NewEncoder(b)
| https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3 | internal/util/helpers.go |
keep keep keep keep replace replace replace replace replace replace replace replace replace | <mask> }
<mask>
<mask> return strings.Contains(string(body), "OpenWrt")
<mask> }
<mask>
<mask> // IsFreeBSD checks if OS is FreeBSD
<mask> func IsFreeBSD() bool {
<mask> if runtime.GOOS == "freebsd" {
<mask> return true
<mask> }
<mask>
<mask> return false
<mask> }
</s> Pull request:* all: fix all staticcheck simplification and unused warnings
Merge in DNS/adguard-home from 2270-fix-s-u-warnings to master
Squashed commit of the following:
commit 03e0f78bd471057007c2d4042ee26eda2bbc9b29
Merge: 50dc3ef5c 7e16fda57
Author: Eugene Burkov <[email protected]>
Date: Fri Nov 6 11:54:09 2020 +0300
Merge branch 'master' into 2270-fix-s-u-warnings
commit 50dc3ef5c44a5fdc941794c26784b0c44d7b5aa0
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 19:48:54 2020 +0300
* all: improve code quality
commit d6d804f759ce3e47154a389b427550e72c4b9090
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 18:03:35 2020 +0300
* all: fix all staticcheck simplification and unused warnings
Closes #2270. </s> remove // MinInt - return the minimum value
func MinInt(a, b int) int {
if a < b {
return a
}
return b
}
// IsOpenWrt checks if OS is OpenWRT
func IsOpenWrt() bool {
</s> add // IsOpenWRT checks if OS is OpenWRT.
func IsOpenWRT() bool { </s> remove // ContainsString checks if "v" is in the array "arr"
func ContainsString(arr []string, v string) bool {
for _, i := range arr {
if i == v {
</s> add // ContainsString checks if string is in the slice of strings.
func ContainsString(strs []string, str string) bool {
for _, s := range strs {
if s == str { </s> remove } else if util.IsFreeBSD() {
</s> add } else if runtime.GOOS == "freebsd" { </s> remove // fileExists returns TRUE if file exists
</s> add // FileExists returns true if file exists. </s> remove func ip6InRange(start net.IP, ip net.IP) bool {
</s> add func ip6InRange(start, ip net.IP) bool { </s> remove if err != nil {
return false
}
return true
</s> add return err == nil | https://github.com/AdguardTeam/AdGuardHome/commit/3e1f922252e2a9b735b0be28733067f3b85bb6f3 | internal/util/helpers.go |
replace keep keep keep keep keep | <mask> // Package aghos contains utilities for functions requiring system calls.
<mask> package aghos
<mask>
<mask> import (
<mask> "fmt"
<mask> "os/exec"
</s> Pull request: all: imp ipset, add tests
Closes #2611.
Squashed commit of the following:
commit f72577757e5cd0299863ccc01780ad9307adc6ea
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 18 17:32:41 2021 +0300
dnsforward: imp err msgs
commit ed8d6dd4b5d7171dfbd57742b53bf96be6cbec29
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 18 17:00:49 2021 +0300
all: imp ipset code
commit 887b3268bae496f4ad616b277f5e28d3ee24a370
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 18 16:09:08 2021 +0300
dnsforward: imp ipset, add tests </s> remove "os"
</s> add </s> remove // IPSET configuration - add IP addresses of the specified domain names to an ipset list
// Syntax:
// "DOMAIN[,DOMAIN].../IPSET_NAME"
IPSETList []string `yaml:"ipset"`
</s> add // IpsetList is the ipset configuration that allows AdGuard Home to add
// IP addresses of the specified domain names to an ipset list. Syntax:
//
// DOMAIN[,DOMAIN].../IPSET_NAME
//
IpsetList []string `yaml:"ipset"` </s> remove if !errors.Is(err, os.ErrInvalid) && !errors.Is(err, os.ErrPermission) {
return fmt.Errorf("cannot initialize ipset: %w", err)
}
// ipset cannot currently be initialized if the server was
// installed from Snap or when the user or the binary doesn't
// have the required permissions, or when the kernel doesn't
// support netfilter.
//
// Log and go on.
//
// TODO(a.garipov): The Snap problem can probably be solved if
// we add the netlink-connector interface plug.
log.Info("warning: cannot initialize ipset: %s", err)
</s> add return err </s> remove // Initialize IPSET configuration
</s> add // Initialize ipset configuration </s> add log.Debug("inited ipset")
</s> remove err := s.ipset.init(s.conf.IPSETList)
</s> add err := s.ipset.init(s.conf.IpsetList) | https://github.com/AdguardTeam/AdGuardHome/commit/3ee0369cb91a0785cbea8ee99eadadad69d54cfa | internal/aghos/os.go |
keep keep keep keep replace replace replace replace keep keep keep keep keep | <mask> EnableDNSSEC bool `yaml:"enable_dnssec"` // Set DNSSEC flag in outcoming DNS request
<mask> EnableEDNSClientSubnet bool `yaml:"edns_client_subnet"` // Enable EDNS Client Subnet option
<mask> MaxGoroutines uint32 `yaml:"max_goroutines"` // Max. number of parallel goroutines for processing incoming requests
<mask>
<mask> // IPSET configuration - add IP addresses of the specified domain names to an ipset list
<mask> // Syntax:
<mask> // "DOMAIN[,DOMAIN].../IPSET_NAME"
<mask> IPSETList []string `yaml:"ipset"`
<mask> }
<mask>
<mask> // TLSConfig is the TLS configuration for HTTPS, DNS-over-HTTPS, and DNS-over-TLS
<mask> type TLSConfig struct {
<mask> TLSListenAddrs []*net.TCPAddr `yaml:"-" json:"-"`
</s> Pull request: all: imp ipset, add tests
Closes #2611.
Squashed commit of the following:
commit f72577757e5cd0299863ccc01780ad9307adc6ea
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 18 17:32:41 2021 +0300
dnsforward: imp err msgs
commit ed8d6dd4b5d7171dfbd57742b53bf96be6cbec29
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 18 17:00:49 2021 +0300
all: imp ipset code
commit 887b3268bae496f4ad616b277f5e28d3ee24a370
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 18 16:09:08 2021 +0300
dnsforward: imp ipset, add tests </s> remove // Initialize IPSET configuration
</s> add // Initialize ipset configuration </s> remove if !errors.Is(err, os.ErrInvalid) && !errors.Is(err, os.ErrPermission) {
return fmt.Errorf("cannot initialize ipset: %w", err)
}
// ipset cannot currently be initialized if the server was
// installed from Snap or when the user or the binary doesn't
// have the required permissions, or when the kernel doesn't
// support netfilter.
//
// Log and go on.
//
// TODO(a.garipov): The Snap problem can probably be solved if
// we add the netlink-connector interface plug.
log.Info("warning: cannot initialize ipset: %s", err)
</s> add return err </s> remove // Package aghos contains utilities for functions requiring system calls.
</s> add // Package aghos contains utilities for functions requiring system calls and
// other OS-specific APIs. OS-specific network handling should go to aghnet
// instead. </s> add log.Debug("inited ipset")
</s> remove if err := s.ipset.Close(); err != nil {
</s> add if err := s.ipset.close(); err != nil { </s> remove err := s.ipset.init(s.conf.IPSETList)
</s> add err := s.ipset.init(s.conf.IpsetList) | https://github.com/AdguardTeam/AdGuardHome/commit/3ee0369cb91a0785cbea8ee99eadadad69d54cfa | internal/dnsforward/config.go |
keep keep keep keep replace keep keep keep keep keep | <mask> import (
<mask> "fmt"
<mask> "net"
<mask> "net/http"
<mask> "os"
<mask> "runtime"
<mask> "strings"
<mask> "sync"
<mask> "time"
<mask>
</s> Pull request: all: imp ipset, add tests
Closes #2611.
Squashed commit of the following:
commit f72577757e5cd0299863ccc01780ad9307adc6ea
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 18 17:32:41 2021 +0300
dnsforward: imp err msgs
commit ed8d6dd4b5d7171dfbd57742b53bf96be6cbec29
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 18 17:00:49 2021 +0300
all: imp ipset code
commit 887b3268bae496f4ad616b277f5e28d3ee24a370
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 18 16:09:08 2021 +0300
dnsforward: imp ipset, add tests </s> remove // Package aghos contains utilities for functions requiring system calls.
</s> add // Package aghos contains utilities for functions requiring system calls and
// other OS-specific APIs. OS-specific network handling should go to aghnet
// instead. </s> add log.Debug("inited ipset")
</s> remove if !errors.Is(err, os.ErrInvalid) && !errors.Is(err, os.ErrPermission) {
return fmt.Errorf("cannot initialize ipset: %w", err)
}
// ipset cannot currently be initialized if the server was
// installed from Snap or when the user or the binary doesn't
// have the required permissions, or when the kernel doesn't
// support netfilter.
//
// Log and go on.
//
// TODO(a.garipov): The Snap problem can probably be solved if
// we add the netlink-connector interface plug.
log.Info("warning: cannot initialize ipset: %s", err)
</s> add return err </s> remove err := s.ipset.init(s.conf.IPSETList)
</s> add err := s.ipset.init(s.conf.IpsetList) </s> remove // Initialize IPSET configuration
</s> add // Initialize ipset configuration </s> remove if err := s.ipset.Close(); err != nil {
</s> add if err := s.ipset.close(); err != nil { | https://github.com/AdguardTeam/AdGuardHome/commit/3ee0369cb91a0785cbea8ee99eadadad69d54cfa | internal/dnsforward/dnsforward.go |
keep keep keep keep replace keep keep keep keep keep | <mask> s.stats = nil
<mask> s.queryLog = nil
<mask> s.dnsProxy = nil
<mask>
<mask> if err := s.ipset.Close(); err != nil {
<mask> log.Error("closing ipset: %s", err)
<mask> }
<mask> }
<mask>
<mask> // WriteDiskConfig - write configuration
</s> Pull request: all: imp ipset, add tests
Closes #2611.
Squashed commit of the following:
commit f72577757e5cd0299863ccc01780ad9307adc6ea
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 18 17:32:41 2021 +0300
dnsforward: imp err msgs
commit ed8d6dd4b5d7171dfbd57742b53bf96be6cbec29
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 18 17:00:49 2021 +0300
all: imp ipset code
commit 887b3268bae496f4ad616b277f5e28d3ee24a370
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 18 16:09:08 2021 +0300
dnsforward: imp ipset, add tests </s> add log.Debug("inited ipset")
</s> remove if !errors.Is(err, os.ErrInvalid) && !errors.Is(err, os.ErrPermission) {
return fmt.Errorf("cannot initialize ipset: %w", err)
}
// ipset cannot currently be initialized if the server was
// installed from Snap or when the user or the binary doesn't
// have the required permissions, or when the kernel doesn't
// support netfilter.
//
// Log and go on.
//
// TODO(a.garipov): The Snap problem can probably be solved if
// we add the netlink-connector interface plug.
log.Info("warning: cannot initialize ipset: %s", err)
</s> add return err </s> remove err := s.ipset.init(s.conf.IPSETList)
</s> add err := s.ipset.init(s.conf.IpsetList) </s> remove // Initialize IPSET configuration
</s> add // Initialize ipset configuration </s> remove // IPSET configuration - add IP addresses of the specified domain names to an ipset list
// Syntax:
// "DOMAIN[,DOMAIN].../IPSET_NAME"
IPSETList []string `yaml:"ipset"`
</s> add // IpsetList is the ipset configuration that allows AdGuard Home to add
// IP addresses of the specified domain names to an ipset list. Syntax:
//
// DOMAIN[,DOMAIN].../IPSET_NAME
//
IpsetList []string `yaml:"ipset"` </s> remove // Package aghos contains utilities for functions requiring system calls.
</s> add // Package aghos contains utilities for functions requiring system calls and
// other OS-specific APIs. OS-specific network handling should go to aghnet
// instead. | https://github.com/AdguardTeam/AdGuardHome/commit/3ee0369cb91a0785cbea8ee99eadadad69d54cfa | internal/dnsforward/dnsforward.go |
keep keep keep replace keep replace keep | <mask> // --
<mask> s.initDefaultSettings()
<mask>
<mask> // Initialize IPSET configuration
<mask> // --
<mask> err := s.ipset.init(s.conf.IPSETList)
<mask> if err != nil {
</s> Pull request: all: imp ipset, add tests
Closes #2611.
Squashed commit of the following:
commit f72577757e5cd0299863ccc01780ad9307adc6ea
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 18 17:32:41 2021 +0300
dnsforward: imp err msgs
commit ed8d6dd4b5d7171dfbd57742b53bf96be6cbec29
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 18 17:00:49 2021 +0300
all: imp ipset code
commit 887b3268bae496f4ad616b277f5e28d3ee24a370
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 18 16:09:08 2021 +0300
dnsforward: imp ipset, add tests </s> remove if !errors.Is(err, os.ErrInvalid) && !errors.Is(err, os.ErrPermission) {
return fmt.Errorf("cannot initialize ipset: %w", err)
}
// ipset cannot currently be initialized if the server was
// installed from Snap or when the user or the binary doesn't
// have the required permissions, or when the kernel doesn't
// support netfilter.
//
// Log and go on.
//
// TODO(a.garipov): The Snap problem can probably be solved if
// we add the netlink-connector interface plug.
log.Info("warning: cannot initialize ipset: %s", err)
</s> add return err </s> remove if err := s.ipset.Close(); err != nil {
</s> add if err := s.ipset.close(); err != nil { </s> add log.Debug("inited ipset")
</s> remove // IPSET configuration - add IP addresses of the specified domain names to an ipset list
// Syntax:
// "DOMAIN[,DOMAIN].../IPSET_NAME"
IPSETList []string `yaml:"ipset"`
</s> add // IpsetList is the ipset configuration that allows AdGuard Home to add
// IP addresses of the specified domain names to an ipset list. Syntax:
//
// DOMAIN[,DOMAIN].../IPSET_NAME
//
IpsetList []string `yaml:"ipset"` </s> remove // Package aghos contains utilities for functions requiring system calls.
</s> add // Package aghos contains utilities for functions requiring system calls and
// other OS-specific APIs. OS-specific network handling should go to aghnet
// instead. | https://github.com/AdguardTeam/AdGuardHome/commit/3ee0369cb91a0785cbea8ee99eadadad69d54cfa | internal/dnsforward/dnsforward.go |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> // Initialize IPSET configuration
<mask> // --
<mask> err := s.ipset.init(s.conf.IPSETList)
<mask> if err != nil {
<mask> if !errors.Is(err, os.ErrInvalid) && !errors.Is(err, os.ErrPermission) {
<mask> return fmt.Errorf("cannot initialize ipset: %w", err)
<mask> }
<mask>
<mask> // ipset cannot currently be initialized if the server was
<mask> // installed from Snap or when the user or the binary doesn't
<mask> // have the required permissions, or when the kernel doesn't
<mask> // support netfilter.
<mask> //
<mask> // Log and go on.
<mask> //
<mask> // TODO(a.garipov): The Snap problem can probably be solved if
<mask> // we add the netlink-connector interface plug.
<mask> log.Info("warning: cannot initialize ipset: %s", err)
<mask> }
<mask>
<mask> // Prepare DNS servers settings
<mask> // --
<mask> err = s.prepareUpstreamSettings()
</s> Pull request: all: imp ipset, add tests
Closes #2611.
Squashed commit of the following:
commit f72577757e5cd0299863ccc01780ad9307adc6ea
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 18 17:32:41 2021 +0300
dnsforward: imp err msgs
commit ed8d6dd4b5d7171dfbd57742b53bf96be6cbec29
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 18 17:00:49 2021 +0300
all: imp ipset code
commit 887b3268bae496f4ad616b277f5e28d3ee24a370
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 18 16:09:08 2021 +0300
dnsforward: imp ipset, add tests </s> remove // Initialize IPSET configuration
</s> add // Initialize ipset configuration </s> add log.Debug("inited ipset")
</s> remove err := s.ipset.init(s.conf.IPSETList)
</s> add err := s.ipset.init(s.conf.IpsetList) </s> remove // IPSET configuration - add IP addresses of the specified domain names to an ipset list
// Syntax:
// "DOMAIN[,DOMAIN].../IPSET_NAME"
IPSETList []string `yaml:"ipset"`
</s> add // IpsetList is the ipset configuration that allows AdGuard Home to add
// IP addresses of the specified domain names to an ipset list. Syntax:
//
// DOMAIN[,DOMAIN].../IPSET_NAME
//
IpsetList []string `yaml:"ipset"` </s> remove if err := s.ipset.Close(); err != nil {
</s> add if err := s.ipset.close(); err != nil { </s> remove // Package aghos contains utilities for functions requiring system calls.
</s> add // Package aghos contains utilities for functions requiring system calls and
// other OS-specific APIs. OS-specific network handling should go to aghnet
// instead. | https://github.com/AdguardTeam/AdGuardHome/commit/3ee0369cb91a0785cbea8ee99eadadad69d54cfa | internal/dnsforward/dnsforward.go |
keep keep add keep keep keep keep keep keep | <mask> return err
<mask> }
<mask>
<mask> // Prepare DNS servers settings
<mask> // --
<mask> err = s.prepareUpstreamSettings()
<mask> if err != nil {
<mask> return err
<mask> }
</s> Pull request: all: imp ipset, add tests
Closes #2611.
Squashed commit of the following:
commit f72577757e5cd0299863ccc01780ad9307adc6ea
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 18 17:32:41 2021 +0300
dnsforward: imp err msgs
commit ed8d6dd4b5d7171dfbd57742b53bf96be6cbec29
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 18 17:00:49 2021 +0300
all: imp ipset code
commit 887b3268bae496f4ad616b277f5e28d3ee24a370
Author: Ainar Garipov <[email protected]>
Date: Fri Jun 18 16:09:08 2021 +0300
dnsforward: imp ipset, add tests </s> remove if !errors.Is(err, os.ErrInvalid) && !errors.Is(err, os.ErrPermission) {
return fmt.Errorf("cannot initialize ipset: %w", err)
}
// ipset cannot currently be initialized if the server was
// installed from Snap or when the user or the binary doesn't
// have the required permissions, or when the kernel doesn't
// support netfilter.
//
// Log and go on.
//
// TODO(a.garipov): The Snap problem can probably be solved if
// we add the netlink-connector interface plug.
log.Info("warning: cannot initialize ipset: %s", err)
</s> add return err </s> remove if err := s.ipset.Close(); err != nil {
</s> add if err := s.ipset.close(); err != nil { </s> remove err := s.ipset.init(s.conf.IPSETList)
</s> add err := s.ipset.init(s.conf.IpsetList) </s> remove // Initialize IPSET configuration
</s> add // Initialize ipset configuration </s> remove // IPSET configuration - add IP addresses of the specified domain names to an ipset list
// Syntax:
// "DOMAIN[,DOMAIN].../IPSET_NAME"
IPSETList []string `yaml:"ipset"`
</s> add // IpsetList is the ipset configuration that allows AdGuard Home to add
// IP addresses of the specified domain names to an ipset list. Syntax:
//
// DOMAIN[,DOMAIN].../IPSET_NAME
//
IpsetList []string `yaml:"ipset"` </s> remove // Package aghos contains utilities for functions requiring system calls.
</s> add // Package aghos contains utilities for functions requiring system calls and
// other OS-specific APIs. OS-specific network handling should go to aghnet
// instead. | https://github.com/AdguardTeam/AdGuardHome/commit/3ee0369cb91a0785cbea8ee99eadadad69d54cfa | internal/dnsforward/dnsforward.go |
keep keep keep keep replace replace replace replace keep keep keep keep keep | <mask>
<mask> return true, nil
<mask> }
<mask>
<mask> // handleDNSRequest filters the incoming DNS requests and writes them to the query log
<mask> // nolint (gocyclo)
<mask> func (s *Server) handleDNSRequest(p *proxy.Proxy, d *proxy.DNSContext) error {
<mask> start := time.Now()
<mask>
<mask> if s.conf.AAAADisabled && d.Req.Question[0].Qtype == dns.TypeAAAA {
<mask> _ = proxy.CheckDisabledAAAARequest(d, true)
<mask> return nil
<mask> }
</s> Merge: * dns: refactor
Squashed commit of the following:
commit e9469266cafa3df537b5a4d5e28ca51db8289a34
Merge: 17cf6d60 e7e946fa
Author: Simon Zolin <[email protected]>
Date: Tue Jan 21 13:04:30 2020 +0300
Merge remote-tracking branch 'origin/master' into refactor
commit 17cf6d60d11602df3837316119ba8828f41a95df
Author: Simon Zolin <[email protected]>
Date: Mon Jan 20 15:25:43 2020 +0300
minor
commit 7b79462ebbeb743a10417bd28ceb70262ff9fa5c
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 17:50:09 2020 +0300
minor
commit d8b175c7eda36005c0277e7876f0f0a55a661b05
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 15:30:37 2020 +0300
minor
commit 93370aa32aa560d42fc67c95fd13f027ddc01b94
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 14:28:14 2020 +0300
* dns: refactor
. introduce a local context object
. move filtering, upstream logic, stats, querylog code to separate functions </s> remove return nil
</s> add return resultFinish </s> add // Perform initial checks; process WHOIS & rDNS
func processInitial(ctx *dnsContext) int {
s := ctx.srv
d := ctx.proxyCtx </s> remove func (s *Server) filterDNSRequest(d *proxy.DNSContext, setts *dnsfilter.RequestFilteringSettings) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSRequest(ctx *dnsContext) (*dnsfilter.Result, error) {
d := ctx.proxyCtx </s> remove res, err := s.dnsFilter.CheckHost(host, d.Req.Question[0].Qtype, setts)
</s> add res, err := s.dnsFilter.CheckHost(host, d.Req.Question[0].Qtype, ctx.setts) </s> remove var origResp *dns.Msg
if d.Res == nil {
answer := []dns.RR{}
originalQuestion := d.Req.Question[0]
</s> add // Pass request to upstream servers; process the response
func processUpstream(ctx *dnsContext) int {
s := ctx.srv
d := ctx.proxyCtx
if d.Res != nil {
return resultDone // response is already set - nothing to do
} </s> add return resultDone
}
// Write Stats data and logs
func processQueryLogsAndStats(ctx *dnsContext) int {
elapsed := time.Since(ctx.startTime)
s := ctx.srv
d := ctx.proxyCtx
| https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e | dnsforward/dnsforward.go |
keep add keep keep keep keep | <mask> )
<mask>
<mask> if s.conf.AAAADisabled && d.Req.Question[0].Qtype == dns.TypeAAAA {
<mask> _ = proxy.CheckDisabledAAAARequest(d, true)
<mask> return resultFinish
<mask> }
</s> Merge: * dns: refactor
Squashed commit of the following:
commit e9469266cafa3df537b5a4d5e28ca51db8289a34
Merge: 17cf6d60 e7e946fa
Author: Simon Zolin <[email protected]>
Date: Tue Jan 21 13:04:30 2020 +0300
Merge remote-tracking branch 'origin/master' into refactor
commit 17cf6d60d11602df3837316119ba8828f41a95df
Author: Simon Zolin <[email protected]>
Date: Mon Jan 20 15:25:43 2020 +0300
minor
commit 7b79462ebbeb743a10417bd28ceb70262ff9fa5c
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 17:50:09 2020 +0300
minor
commit d8b175c7eda36005c0277e7876f0f0a55a661b05
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 15:30:37 2020 +0300
minor
commit 93370aa32aa560d42fc67c95fd13f027ddc01b94
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 14:28:14 2020 +0300
* dns: refactor
. introduce a local context object
. move filtering, upstream logic, stats, querylog code to separate functions </s> remove return nil
</s> add return resultFinish </s> remove // handleDNSRequest filters the incoming DNS requests and writes them to the query log
// nolint (gocyclo)
func (s *Server) handleDNSRequest(p *proxy.Proxy, d *proxy.DNSContext) error {
start := time.Now()
</s> add // To transfer information between modules
type dnsContext struct {
srv *Server
proxyCtx *proxy.DNSContext
setts *dnsfilter.RequestFilteringSettings // filtering settings for this client
startTime time.Time
result *dnsfilter.Result
origResp *dns.Msg // response received from upstream servers. Set when response is modified by filtering
origQuestion dns.Question // question received from client. Set when Rewrites are used.
err error // error returned from the module
protectionEnabled bool // filtering is enabled, dnsfilter object is ready
responseFromUpstream bool // response is received from upstream servers
}
const (
resultDone = iota // module has completed its job, continue
resultFinish // module has completed its job, exit normally
resultError // an error occurred, exit with an error
) </s> remove return nil
</s> add return resultFinish </s> remove // request was not filtered so let it be processed further
err = p.Resolve(d)
if err != nil {
return err
}
</s> add ctx.responseFromUpstream = true
return resultDone
} </s> remove if len(d.Res.Answer) != 0 {
answer = append(answer, d.Res.Answer...) // host -> IP
d.Res.Answer = answer
}
</s> add if !ctx.responseFromUpstream {
return resultDone // don't process response if it's not from upstream servers
} </s> remove } else if res.Reason != dnsfilter.NotFilteredWhiteList && protectionEnabled {
origResp2 := d.Res
res, err = s.filterDNSResponse(d, setts)
if err != nil {
return err
}
if res != nil {
origResp = origResp2 // matched by response
} else {
res = &dnsfilter.Result{}
}
</s> add if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
d.Req.Question[0] = ctx.origQuestion
d.Res.Question[0] = ctx.origQuestion
if len(d.Res.Answer) != 0 {
answer := []dns.RR{}
answer = append(answer, s.genCNAMEAnswer(d.Req, res.CanonName))
answer = append(answer, d.Res.Answer...) // host -> IP
d.Res.Answer = answer | https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e | dnsforward/dnsforward.go |
keep keep keep keep replace keep keep keep keep keep | <mask> start := time.Now()
<mask>
<mask> if s.conf.AAAADisabled && d.Req.Question[0].Qtype == dns.TypeAAAA {
<mask> _ = proxy.CheckDisabledAAAARequest(d, true)
<mask> return nil
<mask> }
<mask>
<mask> if s.conf.OnDNSRequest != nil {
<mask> s.conf.OnDNSRequest(d)
<mask> }
</s> Merge: * dns: refactor
Squashed commit of the following:
commit e9469266cafa3df537b5a4d5e28ca51db8289a34
Merge: 17cf6d60 e7e946fa
Author: Simon Zolin <[email protected]>
Date: Tue Jan 21 13:04:30 2020 +0300
Merge remote-tracking branch 'origin/master' into refactor
commit 17cf6d60d11602df3837316119ba8828f41a95df
Author: Simon Zolin <[email protected]>
Date: Mon Jan 20 15:25:43 2020 +0300
minor
commit 7b79462ebbeb743a10417bd28ceb70262ff9fa5c
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 17:50:09 2020 +0300
minor
commit d8b175c7eda36005c0277e7876f0f0a55a661b05
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 15:30:37 2020 +0300
minor
commit 93370aa32aa560d42fc67c95fd13f027ddc01b94
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 14:28:14 2020 +0300
* dns: refactor
. introduce a local context object
. move filtering, upstream logic, stats, querylog code to separate functions </s> add // Perform initial checks; process WHOIS & rDNS
func processInitial(ctx *dnsContext) int {
s := ctx.srv
d := ctx.proxyCtx </s> remove // handleDNSRequest filters the incoming DNS requests and writes them to the query log
// nolint (gocyclo)
func (s *Server) handleDNSRequest(p *proxy.Proxy, d *proxy.DNSContext) error {
start := time.Now()
</s> add // To transfer information between modules
type dnsContext struct {
srv *Server
proxyCtx *proxy.DNSContext
setts *dnsfilter.RequestFilteringSettings // filtering settings for this client
startTime time.Time
result *dnsfilter.Result
origResp *dns.Msg // response received from upstream servers. Set when response is modified by filtering
origQuestion dns.Question // question received from client. Set when Rewrites are used.
err error // error returned from the module
protectionEnabled bool // filtering is enabled, dnsfilter object is ready
responseFromUpstream bool // response is received from upstream servers
}
const (
resultDone = iota // module has completed its job, continue
resultFinish // module has completed its job, exit normally
resultError // an error occurred, exit with an error
) </s> remove if d.Res != nil {
d.Res.Compress = true // some devices require DNS message compression
</s> add } else if res.Reason != dnsfilter.NotFilteredWhiteList && ctx.protectionEnabled {
origResp2 := d.Res
ctx.result, err = s.filterDNSResponse(ctx)
if err != nil {
ctx.err = err
return resultError
}
if ctx.result != nil {
ctx.origResp = origResp2 // matched by response
} else {
ctx.result = &dnsfilter.Result{}
} </s> remove } else if res.Reason != dnsfilter.NotFilteredWhiteList && protectionEnabled {
origResp2 := d.Res
res, err = s.filterDNSResponse(d, setts)
if err != nil {
return err
}
if res != nil {
origResp = origResp2 // matched by response
} else {
res = &dnsfilter.Result{}
}
</s> add if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
d.Req.Question[0] = ctx.origQuestion
d.Res.Question[0] = ctx.origQuestion
if len(d.Res.Answer) != 0 {
answer := []dns.RR{}
answer = append(answer, s.genCNAMEAnswer(d.Req, res.CanonName))
answer = append(answer, d.Res.Answer...) // host -> IP
d.Res.Answer = answer </s> remove return err
</s> add ctx.err = err
return resultError </s> remove if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
answer = append(answer, s.genCNAMEAnswer(d.Req, res.CanonName))
// resolve canonical name, not the original host name
d.Req.Question[0].Name = dns.Fqdn(res.CanonName)
</s> add if d.Addr != nil && s.conf.GetUpstreamsByClient != nil {
clientIP := ipFromAddr(d.Addr)
upstreams := s.conf.GetUpstreamsByClient(clientIP)
if len(upstreams) > 0 {
log.Debug("Using custom upstreams for %s", clientIP)
d.Upstreams = upstreams | https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e | dnsforward/dnsforward.go |
keep replace keep keep replace keep keep | <mask> d.Res = s.genNXDomain(d.Req)
<mask> return nil
<mask> }
<mask>
<mask> // use dnsfilter before cache -- changed settings or filters would require cache invalidation otherwise
<mask> s.RLock()
<mask> // Synchronize access to s.dnsFilter so it won't be suddenly uninitialized while in use.
</s> Merge: * dns: refactor
Squashed commit of the following:
commit e9469266cafa3df537b5a4d5e28ca51db8289a34
Merge: 17cf6d60 e7e946fa
Author: Simon Zolin <[email protected]>
Date: Tue Jan 21 13:04:30 2020 +0300
Merge remote-tracking branch 'origin/master' into refactor
commit 17cf6d60d11602df3837316119ba8828f41a95df
Author: Simon Zolin <[email protected]>
Date: Mon Jan 20 15:25:43 2020 +0300
minor
commit 7b79462ebbeb743a10417bd28ceb70262ff9fa5c
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 17:50:09 2020 +0300
minor
commit d8b175c7eda36005c0277e7876f0f0a55a661b05
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 15:30:37 2020 +0300
minor
commit 93370aa32aa560d42fc67c95fd13f027ddc01b94
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 14:28:14 2020 +0300
* dns: refactor
. introduce a local context object
. move filtering, upstream logic, stats, querylog code to separate functions </s> remove elapsed := time.Since(start)
</s> add </s> remove if d.Addr != nil && s.conf.GetUpstreamsByClient != nil {
clientIP := ipFromAddr(d.Addr)
upstreams := s.conf.GetUpstreamsByClient(clientIP)
if len(upstreams) > 0 {
log.Debug("Using custom upstreams for %s", clientIP)
d.Upstreams = upstreams
}
}
</s> add // request was not filtered so let it be processed further
err := s.dnsProxy.Resolve(d)
if err != nil {
ctx.err = err
return resultError
} </s> remove var setts *dnsfilter.RequestFilteringSettings
</s> add </s> add } </s> remove // request was not filtered so let it be processed further
err = p.Resolve(d)
if err != nil {
return err
}
</s> add ctx.responseFromUpstream = true
return resultDone
} | https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e | dnsforward/dnsforward.go |
keep keep replace keep replace replace replace replace replace keep | <mask> // (to prevent from hanging while waiting for unresponsive DNS server to respond).
<mask>
<mask> var setts *dnsfilter.RequestFilteringSettings
<mask> var err error
<mask> res := &dnsfilter.Result{}
<mask> protectionEnabled := s.conf.ProtectionEnabled && s.dnsFilter != nil
<mask> if protectionEnabled {
<mask> setts = s.getClientRequestFilteringSettings(d)
<mask> res, err = s.filterDNSRequest(d, setts)
<mask> }
</s> Merge: * dns: refactor
Squashed commit of the following:
commit e9469266cafa3df537b5a4d5e28ca51db8289a34
Merge: 17cf6d60 e7e946fa
Author: Simon Zolin <[email protected]>
Date: Tue Jan 21 13:04:30 2020 +0300
Merge remote-tracking branch 'origin/master' into refactor
commit 17cf6d60d11602df3837316119ba8828f41a95df
Author: Simon Zolin <[email protected]>
Date: Mon Jan 20 15:25:43 2020 +0300
minor
commit 7b79462ebbeb743a10417bd28ceb70262ff9fa5c
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 17:50:09 2020 +0300
minor
commit d8b175c7eda36005c0277e7876f0f0a55a661b05
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 15:30:37 2020 +0300
minor
commit 93370aa32aa560d42fc67c95fd13f027ddc01b94
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 14:28:14 2020 +0300
* dns: refactor
. introduce a local context object
. move filtering, upstream logic, stats, querylog code to separate functions </s> remove return err
</s> add ctx.err = err
return resultError </s> remove } else if res.Reason != dnsfilter.NotFilteredWhiteList && protectionEnabled {
origResp2 := d.Res
res, err = s.filterDNSResponse(d, setts)
if err != nil {
return err
}
if res != nil {
origResp = origResp2 // matched by response
} else {
res = &dnsfilter.Result{}
}
</s> add if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
d.Req.Question[0] = ctx.origQuestion
d.Res.Question[0] = ctx.origQuestion
if len(d.Res.Answer) != 0 {
answer := []dns.RR{}
answer = append(answer, s.genCNAMEAnswer(d.Req, res.CanonName))
answer = append(answer, d.Res.Answer...) // host -> IP
d.Res.Answer = answer </s> remove if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
d.Req.Question[0] = originalQuestion
d.Res.Question[0] = originalQuestion
</s> add // Apply filtering logic after we have received response from upstream servers
func processFilteringAfterResponse(ctx *dnsContext) int {
s := ctx.srv
d := ctx.proxyCtx
res := ctx.result
var err error </s> remove if len(d.Res.Answer) != 0 {
answer = append(answer, d.Res.Answer...) // host -> IP
d.Res.Answer = answer
}
</s> add if !ctx.responseFromUpstream {
return resultDone // don't process response if it's not from upstream servers
} </s> remove // handleDNSRequest filters the incoming DNS requests and writes them to the query log
// nolint (gocyclo)
func (s *Server) handleDNSRequest(p *proxy.Proxy, d *proxy.DNSContext) error {
start := time.Now()
</s> add // To transfer information between modules
type dnsContext struct {
srv *Server
proxyCtx *proxy.DNSContext
setts *dnsfilter.RequestFilteringSettings // filtering settings for this client
startTime time.Time
result *dnsfilter.Result
origResp *dns.Msg // response received from upstream servers. Set when response is modified by filtering
origQuestion dns.Question // question received from client. Set when Rewrites are used.
err error // error returned from the module
protectionEnabled bool // filtering is enabled, dnsfilter object is ready
responseFromUpstream bool // response is received from upstream servers
}
const (
resultDone = iota // module has completed its job, continue
resultFinish // module has completed its job, exit normally
resultError // an error occurred, exit with an error
) | https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e | dnsforward/dnsforward.go |
keep keep keep keep replace keep keep keep keep keep | <mask> res, err = s.filterDNSRequest(d, setts)
<mask> }
<mask> s.RUnlock()
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> var origResp *dns.Msg
<mask> if d.Res == nil {
<mask> answer := []dns.RR{}
</s> Merge: * dns: refactor
Squashed commit of the following:
commit e9469266cafa3df537b5a4d5e28ca51db8289a34
Merge: 17cf6d60 e7e946fa
Author: Simon Zolin <[email protected]>
Date: Tue Jan 21 13:04:30 2020 +0300
Merge remote-tracking branch 'origin/master' into refactor
commit 17cf6d60d11602df3837316119ba8828f41a95df
Author: Simon Zolin <[email protected]>
Date: Mon Jan 20 15:25:43 2020 +0300
minor
commit 7b79462ebbeb743a10417bd28ceb70262ff9fa5c
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 17:50:09 2020 +0300
minor
commit d8b175c7eda36005c0277e7876f0f0a55a661b05
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 15:30:37 2020 +0300
minor
commit 93370aa32aa560d42fc67c95fd13f027ddc01b94
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 14:28:14 2020 +0300
* dns: refactor
. introduce a local context object
. move filtering, upstream logic, stats, querylog code to separate functions </s> remove res := &dnsfilter.Result{}
protectionEnabled := s.conf.ProtectionEnabled && s.dnsFilter != nil
if protectionEnabled {
setts = s.getClientRequestFilteringSettings(d)
res, err = s.filterDNSRequest(d, setts)
</s> add ctx.protectionEnabled = s.conf.ProtectionEnabled && s.dnsFilter != nil
if ctx.protectionEnabled {
ctx.setts = s.getClientRequestFilteringSettings(d)
ctx.result, err = s.filterDNSRequest(ctx) </s> remove var origResp *dns.Msg
if d.Res == nil {
answer := []dns.RR{}
originalQuestion := d.Req.Question[0]
</s> add // Pass request to upstream servers; process the response
func processUpstream(ctx *dnsContext) int {
s := ctx.srv
d := ctx.proxyCtx
if d.Res != nil {
return resultDone // response is already set - nothing to do
} </s> remove } else if res.Reason != dnsfilter.NotFilteredWhiteList && protectionEnabled {
origResp2 := d.Res
res, err = s.filterDNSResponse(d, setts)
if err != nil {
return err
}
if res != nil {
origResp = origResp2 // matched by response
} else {
res = &dnsfilter.Result{}
}
</s> add if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
d.Req.Question[0] = ctx.origQuestion
d.Res.Question[0] = ctx.origQuestion
if len(d.Res.Answer) != 0 {
answer := []dns.RR{}
answer = append(answer, s.genCNAMEAnswer(d.Req, res.CanonName))
answer = append(answer, d.Res.Answer...) // host -> IP
d.Res.Answer = answer </s> remove res, err := s.dnsFilter.CheckHostRules(host, d.Req.Question[0].Qtype, setts)
</s> add res, err := s.dnsFilter.CheckHostRules(host, d.Req.Question[0].Qtype, ctx.setts) </s> remove if len(d.Res.Answer) != 0 {
answer = append(answer, d.Res.Answer...) // host -> IP
d.Res.Answer = answer
}
</s> add if !ctx.responseFromUpstream {
return resultDone // don't process response if it's not from upstream servers
} </s> remove if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
d.Req.Question[0] = originalQuestion
d.Res.Question[0] = originalQuestion
</s> add // Apply filtering logic after we have received response from upstream servers
func processFilteringAfterResponse(ctx *dnsContext) int {
s := ctx.srv
d := ctx.proxyCtx
res := ctx.result
var err error | https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e | dnsforward/dnsforward.go |
keep keep add keep keep keep keep keep | <mask> ctx.err = err
<mask> return resultError
<mask> }
<mask>
<mask> // Pass request to upstream servers; process the response
<mask> func processUpstream(ctx *dnsContext) int {
<mask> s := ctx.srv
<mask> d := ctx.proxyCtx
</s> Merge: * dns: refactor
Squashed commit of the following:
commit e9469266cafa3df537b5a4d5e28ca51db8289a34
Merge: 17cf6d60 e7e946fa
Author: Simon Zolin <[email protected]>
Date: Tue Jan 21 13:04:30 2020 +0300
Merge remote-tracking branch 'origin/master' into refactor
commit 17cf6d60d11602df3837316119ba8828f41a95df
Author: Simon Zolin <[email protected]>
Date: Mon Jan 20 15:25:43 2020 +0300
minor
commit 7b79462ebbeb743a10417bd28ceb70262ff9fa5c
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 17:50:09 2020 +0300
minor
commit d8b175c7eda36005c0277e7876f0f0a55a661b05
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 15:30:37 2020 +0300
minor
commit 93370aa32aa560d42fc67c95fd13f027ddc01b94
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 14:28:14 2020 +0300
* dns: refactor
. introduce a local context object
. move filtering, upstream logic, stats, querylog code to separate functions </s> remove var origResp *dns.Msg
if d.Res == nil {
answer := []dns.RR{}
originalQuestion := d.Req.Question[0]
</s> add // Pass request to upstream servers; process the response
func processUpstream(ctx *dnsContext) int {
s := ctx.srv
d := ctx.proxyCtx
if d.Res != nil {
return resultDone // response is already set - nothing to do
} </s> add // Perform initial checks; process WHOIS & rDNS
func processInitial(ctx *dnsContext) int {
s := ctx.srv
d := ctx.proxyCtx </s> remove if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
d.Req.Question[0] = originalQuestion
d.Res.Question[0] = originalQuestion
</s> add // Apply filtering logic after we have received response from upstream servers
func processFilteringAfterResponse(ctx *dnsContext) int {
s := ctx.srv
d := ctx.proxyCtx
res := ctx.result
var err error </s> add return resultDone
}
// Write Stats data and logs
func processQueryLogsAndStats(ctx *dnsContext) int {
elapsed := time.Since(ctx.startTime)
s := ctx.srv
d := ctx.proxyCtx
</s> remove if d.Addr != nil && s.conf.GetUpstreamsByClient != nil {
clientIP := ipFromAddr(d.Addr)
upstreams := s.conf.GetUpstreamsByClient(clientIP)
if len(upstreams) > 0 {
log.Debug("Using custom upstreams for %s", clientIP)
d.Upstreams = upstreams
}
}
</s> add // request was not filtered so let it be processed further
err := s.dnsProxy.Resolve(d)
if err != nil {
ctx.err = err
return resultError
} </s> remove // use dnsfilter before cache -- changed settings or filters would require cache invalidation otherwise
</s> add return resultDone
}
// Apply filtering logic
func processFilteringBeforeRequest(ctx *dnsContext) int {
s := ctx.srv
d := ctx.proxyCtx
| https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e | dnsforward/dnsforward.go |
keep keep keep replace replace replace replace keep replace replace replace replace keep keep keep | <mask> return err
<mask> }
<mask>
<mask> var origResp *dns.Msg
<mask> if d.Res == nil {
<mask> answer := []dns.RR{}
<mask> originalQuestion := d.Req.Question[0]
<mask>
<mask> if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
<mask> answer = append(answer, s.genCNAMEAnswer(d.Req, res.CanonName))
<mask> // resolve canonical name, not the original host name
<mask> d.Req.Question[0].Name = dns.Fqdn(res.CanonName)
<mask> }
<mask>
<mask> if d.Addr != nil && s.conf.GetUpstreamsByClient != nil {
</s> Merge: * dns: refactor
Squashed commit of the following:
commit e9469266cafa3df537b5a4d5e28ca51db8289a34
Merge: 17cf6d60 e7e946fa
Author: Simon Zolin <[email protected]>
Date: Tue Jan 21 13:04:30 2020 +0300
Merge remote-tracking branch 'origin/master' into refactor
commit 17cf6d60d11602df3837316119ba8828f41a95df
Author: Simon Zolin <[email protected]>
Date: Mon Jan 20 15:25:43 2020 +0300
minor
commit 7b79462ebbeb743a10417bd28ceb70262ff9fa5c
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 17:50:09 2020 +0300
minor
commit d8b175c7eda36005c0277e7876f0f0a55a661b05
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 15:30:37 2020 +0300
minor
commit 93370aa32aa560d42fc67c95fd13f027ddc01b94
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 14:28:14 2020 +0300
* dns: refactor
. introduce a local context object
. move filtering, upstream logic, stats, querylog code to separate functions </s> remove } else if res.Reason != dnsfilter.NotFilteredWhiteList && protectionEnabled {
origResp2 := d.Res
res, err = s.filterDNSResponse(d, setts)
if err != nil {
return err
}
if res != nil {
origResp = origResp2 // matched by response
} else {
res = &dnsfilter.Result{}
}
</s> add if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
d.Req.Question[0] = ctx.origQuestion
d.Res.Question[0] = ctx.origQuestion
if len(d.Res.Answer) != 0 {
answer := []dns.RR{}
answer = append(answer, s.genCNAMEAnswer(d.Req, res.CanonName))
answer = append(answer, d.Res.Answer...) // host -> IP
d.Res.Answer = answer </s> remove if d.Addr != nil && s.conf.GetUpstreamsByClient != nil {
clientIP := ipFromAddr(d.Addr)
upstreams := s.conf.GetUpstreamsByClient(clientIP)
if len(upstreams) > 0 {
log.Debug("Using custom upstreams for %s", clientIP)
d.Upstreams = upstreams
}
}
</s> add // request was not filtered so let it be processed further
err := s.dnsProxy.Resolve(d)
if err != nil {
ctx.err = err
return resultError
} </s> add } else if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
ctx.origQuestion = d.Req.Question[0]
// resolve canonical name, not the original host name
d.Req.Question[0].Name = dns.Fqdn(res.CanonName) </s> remove if len(d.Res.Answer) != 0 {
answer = append(answer, d.Res.Answer...) // host -> IP
d.Res.Answer = answer
}
</s> add if !ctx.responseFromUpstream {
return resultDone // don't process response if it's not from upstream servers
} </s> remove if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
d.Req.Question[0] = originalQuestion
d.Res.Question[0] = originalQuestion
</s> add // Apply filtering logic after we have received response from upstream servers
func processFilteringAfterResponse(ctx *dnsContext) int {
s := ctx.srv
d := ctx.proxyCtx
res := ctx.result
var err error | https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e | dnsforward/dnsforward.go |
keep add keep keep keep keep | <mask> d.Upstreams = upstreams
<mask> }
<mask>
<mask> // request was not filtered so let it be processed further
<mask> err := s.dnsProxy.Resolve(d)
<mask> if err != nil {
</s> Merge: * dns: refactor
Squashed commit of the following:
commit e9469266cafa3df537b5a4d5e28ca51db8289a34
Merge: 17cf6d60 e7e946fa
Author: Simon Zolin <[email protected]>
Date: Tue Jan 21 13:04:30 2020 +0300
Merge remote-tracking branch 'origin/master' into refactor
commit 17cf6d60d11602df3837316119ba8828f41a95df
Author: Simon Zolin <[email protected]>
Date: Mon Jan 20 15:25:43 2020 +0300
minor
commit 7b79462ebbeb743a10417bd28ceb70262ff9fa5c
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 17:50:09 2020 +0300
minor
commit d8b175c7eda36005c0277e7876f0f0a55a661b05
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 15:30:37 2020 +0300
minor
commit 93370aa32aa560d42fc67c95fd13f027ddc01b94
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 14:28:14 2020 +0300
* dns: refactor
. introduce a local context object
. move filtering, upstream logic, stats, querylog code to separate functions </s> remove if d.Addr != nil && s.conf.GetUpstreamsByClient != nil {
clientIP := ipFromAddr(d.Addr)
upstreams := s.conf.GetUpstreamsByClient(clientIP)
if len(upstreams) > 0 {
log.Debug("Using custom upstreams for %s", clientIP)
d.Upstreams = upstreams
}
}
</s> add // request was not filtered so let it be processed further
err := s.dnsProxy.Resolve(d)
if err != nil {
ctx.err = err
return resultError
} </s> remove // request was not filtered so let it be processed further
err = p.Resolve(d)
if err != nil {
return err
}
</s> add ctx.responseFromUpstream = true
return resultDone
} </s> remove if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
answer = append(answer, s.genCNAMEAnswer(d.Req, res.CanonName))
// resolve canonical name, not the original host name
d.Req.Question[0].Name = dns.Fqdn(res.CanonName)
</s> add if d.Addr != nil && s.conf.GetUpstreamsByClient != nil {
clientIP := ipFromAddr(d.Addr)
upstreams := s.conf.GetUpstreamsByClient(clientIP)
if len(upstreams) > 0 {
log.Debug("Using custom upstreams for %s", clientIP)
d.Upstreams = upstreams </s> remove func (s *Server) filterDNSRequest(d *proxy.DNSContext, setts *dnsfilter.RequestFilteringSettings) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSRequest(ctx *dnsContext) (*dnsfilter.Result, error) {
d := ctx.proxyCtx </s> remove res, err := s.dnsFilter.CheckHost(host, d.Req.Question[0].Qtype, setts)
</s> add res, err := s.dnsFilter.CheckHost(host, d.Req.Question[0].Qtype, ctx.setts) </s> remove var origResp *dns.Msg
if d.Res == nil {
answer := []dns.RR{}
originalQuestion := d.Req.Question[0]
</s> add // Pass request to upstream servers; process the response
func processUpstream(ctx *dnsContext) int {
s := ctx.srv
d := ctx.proxyCtx
if d.Res != nil {
return resultDone // response is already set - nothing to do
} | https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e | dnsforward/dnsforward.go |
keep keep replace replace replace replace replace replace replace replace keep replace replace replace replace replace keep keep | <mask> }
<mask>
<mask> if d.Addr != nil && s.conf.GetUpstreamsByClient != nil {
<mask> clientIP := ipFromAddr(d.Addr)
<mask> upstreams := s.conf.GetUpstreamsByClient(clientIP)
<mask> if len(upstreams) > 0 {
<mask> log.Debug("Using custom upstreams for %s", clientIP)
<mask> d.Upstreams = upstreams
<mask> }
<mask> }
<mask>
<mask> // request was not filtered so let it be processed further
<mask> err = p.Resolve(d)
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
</s> Merge: * dns: refactor
Squashed commit of the following:
commit e9469266cafa3df537b5a4d5e28ca51db8289a34
Merge: 17cf6d60 e7e946fa
Author: Simon Zolin <[email protected]>
Date: Tue Jan 21 13:04:30 2020 +0300
Merge remote-tracking branch 'origin/master' into refactor
commit 17cf6d60d11602df3837316119ba8828f41a95df
Author: Simon Zolin <[email protected]>
Date: Mon Jan 20 15:25:43 2020 +0300
minor
commit 7b79462ebbeb743a10417bd28ceb70262ff9fa5c
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 17:50:09 2020 +0300
minor
commit d8b175c7eda36005c0277e7876f0f0a55a661b05
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 15:30:37 2020 +0300
minor
commit 93370aa32aa560d42fc67c95fd13f027ddc01b94
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 14:28:14 2020 +0300
* dns: refactor
. introduce a local context object
. move filtering, upstream logic, stats, querylog code to separate functions </s> remove if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
answer = append(answer, s.genCNAMEAnswer(d.Req, res.CanonName))
// resolve canonical name, not the original host name
d.Req.Question[0].Name = dns.Fqdn(res.CanonName)
</s> add if d.Addr != nil && s.conf.GetUpstreamsByClient != nil {
clientIP := ipFromAddr(d.Addr)
upstreams := s.conf.GetUpstreamsByClient(clientIP)
if len(upstreams) > 0 {
log.Debug("Using custom upstreams for %s", clientIP)
d.Upstreams = upstreams </s> add } </s> remove if len(d.Res.Answer) != 0 {
answer = append(answer, d.Res.Answer...) // host -> IP
d.Res.Answer = answer
}
</s> add if !ctx.responseFromUpstream {
return resultDone // don't process response if it's not from upstream servers
} </s> remove } else if res.Reason != dnsfilter.NotFilteredWhiteList && protectionEnabled {
origResp2 := d.Res
res, err = s.filterDNSResponse(d, setts)
if err != nil {
return err
}
if res != nil {
origResp = origResp2 // matched by response
} else {
res = &dnsfilter.Result{}
}
</s> add if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
d.Req.Question[0] = ctx.origQuestion
d.Res.Question[0] = ctx.origQuestion
if len(d.Res.Answer) != 0 {
answer := []dns.RR{}
answer = append(answer, s.genCNAMEAnswer(d.Req, res.CanonName))
answer = append(answer, d.Res.Answer...) // host -> IP
d.Res.Answer = answer </s> remove var origResp *dns.Msg
if d.Res == nil {
answer := []dns.RR{}
originalQuestion := d.Req.Question[0]
</s> add // Pass request to upstream servers; process the response
func processUpstream(ctx *dnsContext) int {
s := ctx.srv
d := ctx.proxyCtx
if d.Res != nil {
return resultDone // response is already set - nothing to do
} | https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e | dnsforward/dnsforward.go |
keep replace replace replace keep replace replace replace replace keep keep | <mask>
<mask> if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
<mask> d.Req.Question[0] = originalQuestion
<mask> d.Res.Question[0] = originalQuestion
<mask>
<mask> if len(d.Res.Answer) != 0 {
<mask> answer = append(answer, d.Res.Answer...) // host -> IP
<mask> d.Res.Answer = answer
<mask> }
<mask>
<mask> } else if res.Reason != dnsfilter.NotFilteredWhiteList && protectionEnabled {
</s> Merge: * dns: refactor
Squashed commit of the following:
commit e9469266cafa3df537b5a4d5e28ca51db8289a34
Merge: 17cf6d60 e7e946fa
Author: Simon Zolin <[email protected]>
Date: Tue Jan 21 13:04:30 2020 +0300
Merge remote-tracking branch 'origin/master' into refactor
commit 17cf6d60d11602df3837316119ba8828f41a95df
Author: Simon Zolin <[email protected]>
Date: Mon Jan 20 15:25:43 2020 +0300
minor
commit 7b79462ebbeb743a10417bd28ceb70262ff9fa5c
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 17:50:09 2020 +0300
minor
commit d8b175c7eda36005c0277e7876f0f0a55a661b05
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 15:30:37 2020 +0300
minor
commit 93370aa32aa560d42fc67c95fd13f027ddc01b94
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 14:28:14 2020 +0300
* dns: refactor
. introduce a local context object
. move filtering, upstream logic, stats, querylog code to separate functions </s> remove } else if res.Reason != dnsfilter.NotFilteredWhiteList && protectionEnabled {
origResp2 := d.Res
res, err = s.filterDNSResponse(d, setts)
if err != nil {
return err
}
if res != nil {
origResp = origResp2 // matched by response
} else {
res = &dnsfilter.Result{}
}
</s> add if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
d.Req.Question[0] = ctx.origQuestion
d.Res.Question[0] = ctx.origQuestion
if len(d.Res.Answer) != 0 {
answer := []dns.RR{}
answer = append(answer, s.genCNAMEAnswer(d.Req, res.CanonName))
answer = append(answer, d.Res.Answer...) // host -> IP
d.Res.Answer = answer </s> remove // request was not filtered so let it be processed further
err = p.Resolve(d)
if err != nil {
return err
}
</s> add ctx.responseFromUpstream = true
return resultDone
} </s> remove if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
answer = append(answer, s.genCNAMEAnswer(d.Req, res.CanonName))
// resolve canonical name, not the original host name
d.Req.Question[0].Name = dns.Fqdn(res.CanonName)
</s> add if d.Addr != nil && s.conf.GetUpstreamsByClient != nil {
clientIP := ipFromAddr(d.Addr)
upstreams := s.conf.GetUpstreamsByClient(clientIP)
if len(upstreams) > 0 {
log.Debug("Using custom upstreams for %s", clientIP)
d.Upstreams = upstreams </s> remove var origResp *dns.Msg
if d.Res == nil {
answer := []dns.RR{}
originalQuestion := d.Req.Question[0]
</s> add // Pass request to upstream servers; process the response
func processUpstream(ctx *dnsContext) int {
s := ctx.srv
d := ctx.proxyCtx
if d.Res != nil {
return resultDone // response is already set - nothing to do
} </s> add } else if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
ctx.origQuestion = d.Req.Question[0]
// resolve canonical name, not the original host name
d.Req.Question[0].Name = dns.Fqdn(res.CanonName) | https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e | dnsforward/dnsforward.go |
keep keep replace replace replace replace replace replace replace replace replace replace replace keep replace keep keep keep keep | <mask> }
<mask>
<mask> } else if res.Reason != dnsfilter.NotFilteredWhiteList && protectionEnabled {
<mask> origResp2 := d.Res
<mask> res, err = s.filterDNSResponse(d, setts)
<mask> if err != nil {
<mask> return err
<mask> }
<mask> if res != nil {
<mask> origResp = origResp2 // matched by response
<mask> } else {
<mask> res = &dnsfilter.Result{}
<mask> }
<mask> }
<mask> }
<mask>
<mask> if d.Res != nil {
<mask> d.Res.Compress = true // some devices require DNS message compression
<mask> }
</s> Merge: * dns: refactor
Squashed commit of the following:
commit e9469266cafa3df537b5a4d5e28ca51db8289a34
Merge: 17cf6d60 e7e946fa
Author: Simon Zolin <[email protected]>
Date: Tue Jan 21 13:04:30 2020 +0300
Merge remote-tracking branch 'origin/master' into refactor
commit 17cf6d60d11602df3837316119ba8828f41a95df
Author: Simon Zolin <[email protected]>
Date: Mon Jan 20 15:25:43 2020 +0300
minor
commit 7b79462ebbeb743a10417bd28ceb70262ff9fa5c
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 17:50:09 2020 +0300
minor
commit d8b175c7eda36005c0277e7876f0f0a55a661b05
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 15:30:37 2020 +0300
minor
commit 93370aa32aa560d42fc67c95fd13f027ddc01b94
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 14:28:14 2020 +0300
* dns: refactor
. introduce a local context object
. move filtering, upstream logic, stats, querylog code to separate functions </s> remove if d.Res != nil {
d.Res.Compress = true // some devices require DNS message compression
</s> add } else if res.Reason != dnsfilter.NotFilteredWhiteList && ctx.protectionEnabled {
origResp2 := d.Res
ctx.result, err = s.filterDNSResponse(ctx)
if err != nil {
ctx.err = err
return resultError
}
if ctx.result != nil {
ctx.origResp = origResp2 // matched by response
} else {
ctx.result = &dnsfilter.Result{}
} </s> remove if len(d.Res.Answer) != 0 {
answer = append(answer, d.Res.Answer...) // host -> IP
d.Res.Answer = answer
}
</s> add if !ctx.responseFromUpstream {
return resultDone // don't process response if it's not from upstream servers
} </s> remove res := &dnsfilter.Result{}
protectionEnabled := s.conf.ProtectionEnabled && s.dnsFilter != nil
if protectionEnabled {
setts = s.getClientRequestFilteringSettings(d)
res, err = s.filterDNSRequest(d, setts)
</s> add ctx.protectionEnabled = s.conf.ProtectionEnabled && s.dnsFilter != nil
if ctx.protectionEnabled {
ctx.setts = s.getClientRequestFilteringSettings(d)
ctx.result, err = s.filterDNSRequest(ctx) </s> remove return err
</s> add ctx.err = err
return resultError </s> remove if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
d.Req.Question[0] = originalQuestion
d.Res.Question[0] = originalQuestion
</s> add // Apply filtering logic after we have received response from upstream servers
func processFilteringAfterResponse(ctx *dnsContext) int {
s := ctx.srv
d := ctx.proxyCtx
res := ctx.result
var err error | https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e | dnsforward/dnsforward.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> }
<mask> }
<mask> }
<mask>
<mask> if d.Res != nil {
<mask> d.Res.Compress = true // some devices require DNS message compression
<mask> }
<mask>
<mask> shouldLog := true
<mask> msg := d.Req
<mask>
</s> Merge: * dns: refactor
Squashed commit of the following:
commit e9469266cafa3df537b5a4d5e28ca51db8289a34
Merge: 17cf6d60 e7e946fa
Author: Simon Zolin <[email protected]>
Date: Tue Jan 21 13:04:30 2020 +0300
Merge remote-tracking branch 'origin/master' into refactor
commit 17cf6d60d11602df3837316119ba8828f41a95df
Author: Simon Zolin <[email protected]>
Date: Mon Jan 20 15:25:43 2020 +0300
minor
commit 7b79462ebbeb743a10417bd28ceb70262ff9fa5c
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 17:50:09 2020 +0300
minor
commit d8b175c7eda36005c0277e7876f0f0a55a661b05
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 15:30:37 2020 +0300
minor
commit 93370aa32aa560d42fc67c95fd13f027ddc01b94
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 14:28:14 2020 +0300
* dns: refactor
. introduce a local context object
. move filtering, upstream logic, stats, querylog code to separate functions </s> remove }
</s> add </s> remove } else if res.Reason != dnsfilter.NotFilteredWhiteList && protectionEnabled {
origResp2 := d.Res
res, err = s.filterDNSResponse(d, setts)
if err != nil {
return err
}
if res != nil {
origResp = origResp2 // matched by response
} else {
res = &dnsfilter.Result{}
}
</s> add if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
d.Req.Question[0] = ctx.origQuestion
d.Res.Question[0] = ctx.origQuestion
if len(d.Res.Answer) != 0 {
answer := []dns.RR{}
answer = append(answer, s.genCNAMEAnswer(d.Req, res.CanonName))
answer = append(answer, d.Res.Answer...) // host -> IP
d.Res.Answer = answer </s> add return resultDone
}
// Write Stats data and logs
func processQueryLogsAndStats(ctx *dnsContext) int {
elapsed := time.Since(ctx.startTime)
s := ctx.srv
d := ctx.proxyCtx
</s> remove // request was not filtered so let it be processed further
err = p.Resolve(d)
if err != nil {
return err
}
</s> add ctx.responseFromUpstream = true
return resultDone
} </s> remove res := &dnsfilter.Result{}
protectionEnabled := s.conf.ProtectionEnabled && s.dnsFilter != nil
if protectionEnabled {
setts = s.getClientRequestFilteringSettings(d)
res, err = s.filterDNSRequest(d, setts)
</s> add ctx.protectionEnabled = s.conf.ProtectionEnabled && s.dnsFilter != nil
if ctx.protectionEnabled {
ctx.setts = s.getClientRequestFilteringSettings(d)
ctx.result, err = s.filterDNSRequest(ctx) </s> remove if d.Addr != nil && s.conf.GetUpstreamsByClient != nil {
clientIP := ipFromAddr(d.Addr)
upstreams := s.conf.GetUpstreamsByClient(clientIP)
if len(upstreams) > 0 {
log.Debug("Using custom upstreams for %s", clientIP)
d.Upstreams = upstreams
}
}
</s> add // request was not filtered so let it be processed further
err := s.dnsProxy.Resolve(d)
if err != nil {
ctx.err = err
return resultError
} | https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e | dnsforward/dnsforward.go |
keep add keep keep keep keep keep | <mask> }
<mask>
<mask> shouldLog := true
<mask> msg := d.Req
<mask>
<mask> // don't log ANY request if refuseAny is enabled
<mask> if len(msg.Question) >= 1 && msg.Question[0].Qtype == dns.TypeANY && s.conf.RefuseAny {
</s> Merge: * dns: refactor
Squashed commit of the following:
commit e9469266cafa3df537b5a4d5e28ca51db8289a34
Merge: 17cf6d60 e7e946fa
Author: Simon Zolin <[email protected]>
Date: Tue Jan 21 13:04:30 2020 +0300
Merge remote-tracking branch 'origin/master' into refactor
commit 17cf6d60d11602df3837316119ba8828f41a95df
Author: Simon Zolin <[email protected]>
Date: Mon Jan 20 15:25:43 2020 +0300
minor
commit 7b79462ebbeb743a10417bd28ceb70262ff9fa5c
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 17:50:09 2020 +0300
minor
commit d8b175c7eda36005c0277e7876f0f0a55a661b05
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 15:30:37 2020 +0300
minor
commit 93370aa32aa560d42fc67c95fd13f027ddc01b94
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 14:28:14 2020 +0300
* dns: refactor
. introduce a local context object
. move filtering, upstream logic, stats, querylog code to separate functions </s> remove elapsed := time.Since(start)
</s> add </s> remove if d.Res != nil {
d.Res.Compress = true // some devices require DNS message compression
</s> add } else if res.Reason != dnsfilter.NotFilteredWhiteList && ctx.protectionEnabled {
origResp2 := d.Res
ctx.result, err = s.filterDNSResponse(ctx)
if err != nil {
ctx.err = err
return resultError
}
if ctx.result != nil {
ctx.origResp = origResp2 // matched by response
} else {
ctx.result = &dnsfilter.Result{}
} </s> remove if len(d.Res.Answer) != 0 {
answer = append(answer, d.Res.Answer...) // host -> IP
d.Res.Answer = answer
}
</s> add if !ctx.responseFromUpstream {
return resultDone // don't process response if it's not from upstream servers
} </s> remove var origResp *dns.Msg
if d.Res == nil {
answer := []dns.RR{}
originalQuestion := d.Req.Question[0]
</s> add // Pass request to upstream servers; process the response
func processUpstream(ctx *dnsContext) int {
s := ctx.srv
d := ctx.proxyCtx
if d.Res != nil {
return resultDone // response is already set - nothing to do
} </s> remove } else if res.Reason != dnsfilter.NotFilteredWhiteList && protectionEnabled {
origResp2 := d.Res
res, err = s.filterDNSResponse(d, setts)
if err != nil {
return err
}
if res != nil {
origResp = origResp2 // matched by response
} else {
res = &dnsfilter.Result{}
}
</s> add if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
d.Req.Question[0] = ctx.origQuestion
d.Res.Question[0] = ctx.origQuestion
if len(d.Res.Answer) != 0 {
answer := []dns.RR{}
answer = append(answer, s.genCNAMEAnswer(d.Req, res.CanonName))
answer = append(answer, d.Res.Answer...) // host -> IP
d.Res.Answer = answer </s> remove func (s *Server) filterDNSRequest(d *proxy.DNSContext, setts *dnsfilter.RequestFilteringSettings) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSRequest(ctx *dnsContext) (*dnsfilter.Result, error) {
d := ctx.proxyCtx | https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e | dnsforward/dnsforward.go |
keep keep keep keep replace keep keep keep keep keep | <mask> if len(msg.Question) >= 1 && msg.Question[0].Qtype == dns.TypeANY && s.conf.RefuseAny {
<mask> shouldLog = false
<mask> }
<mask>
<mask> elapsed := time.Since(start)
<mask> s.RLock()
<mask> // Synchronize access to s.queryLog and s.stats so they won't be suddenly uninitialized while in use.
<mask> // This can happen after proxy server has been stopped, but its workers haven't yet exited.
<mask> if shouldLog && s.queryLog != nil {
<mask> p := querylog.AddParams{
</s> Merge: * dns: refactor
Squashed commit of the following:
commit e9469266cafa3df537b5a4d5e28ca51db8289a34
Merge: 17cf6d60 e7e946fa
Author: Simon Zolin <[email protected]>
Date: Tue Jan 21 13:04:30 2020 +0300
Merge remote-tracking branch 'origin/master' into refactor
commit 17cf6d60d11602df3837316119ba8828f41a95df
Author: Simon Zolin <[email protected]>
Date: Mon Jan 20 15:25:43 2020 +0300
minor
commit 7b79462ebbeb743a10417bd28ceb70262ff9fa5c
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 17:50:09 2020 +0300
minor
commit d8b175c7eda36005c0277e7876f0f0a55a661b05
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 15:30:37 2020 +0300
minor
commit 93370aa32aa560d42fc67c95fd13f027ddc01b94
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 14:28:14 2020 +0300
* dns: refactor
. introduce a local context object
. move filtering, upstream logic, stats, querylog code to separate functions </s> remove // use dnsfilter before cache -- changed settings or filters would require cache invalidation otherwise
</s> add return resultDone
}
// Apply filtering logic
func processFilteringBeforeRequest(ctx *dnsContext) int {
s := ctx.srv
d := ctx.proxyCtx
</s> add return resultDone
}
// Write Stats data and logs
func processQueryLogsAndStats(ctx *dnsContext) int {
elapsed := time.Since(ctx.startTime)
s := ctx.srv
d := ctx.proxyCtx
</s> remove return nil
</s> add return resultFinish </s> remove OrigAnswer: origResp,
Result: res,
</s> add OrigAnswer: ctx.origResp,
Result: ctx.result, </s> remove var setts *dnsfilter.RequestFilteringSettings
</s> add </s> remove if d.Res != nil {
d.Res.Compress = true // some devices require DNS message compression
</s> add } else if res.Reason != dnsfilter.NotFilteredWhiteList && ctx.protectionEnabled {
origResp2 := d.Res
ctx.result, err = s.filterDNSResponse(ctx)
if err != nil {
ctx.err = err
return resultError
}
if ctx.result != nil {
ctx.origResp = origResp2 // matched by response
} else {
ctx.result = &dnsfilter.Result{}
} | https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e | dnsforward/dnsforward.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> if shouldLog && s.queryLog != nil {
<mask> p := querylog.AddParams{
<mask> Question: msg,
<mask> Answer: d.Res,
<mask> OrigAnswer: origResp,
<mask> Result: res,
<mask> Elapsed: elapsed,
<mask> ClientIP: getIP(d.Addr),
<mask> }
<mask> if d.Upstream != nil {
<mask> p.Upstream = d.Upstream.Address()
</s> Merge: * dns: refactor
Squashed commit of the following:
commit e9469266cafa3df537b5a4d5e28ca51db8289a34
Merge: 17cf6d60 e7e946fa
Author: Simon Zolin <[email protected]>
Date: Tue Jan 21 13:04:30 2020 +0300
Merge remote-tracking branch 'origin/master' into refactor
commit 17cf6d60d11602df3837316119ba8828f41a95df
Author: Simon Zolin <[email protected]>
Date: Mon Jan 20 15:25:43 2020 +0300
minor
commit 7b79462ebbeb743a10417bd28ceb70262ff9fa5c
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 17:50:09 2020 +0300
minor
commit d8b175c7eda36005c0277e7876f0f0a55a661b05
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 15:30:37 2020 +0300
minor
commit 93370aa32aa560d42fc67c95fd13f027ddc01b94
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 14:28:14 2020 +0300
* dns: refactor
. introduce a local context object
. move filtering, upstream logic, stats, querylog code to separate functions </s> remove elapsed := time.Since(start)
</s> add </s> remove if d.Res != nil {
d.Res.Compress = true // some devices require DNS message compression
</s> add } else if res.Reason != dnsfilter.NotFilteredWhiteList && ctx.protectionEnabled {
origResp2 := d.Res
ctx.result, err = s.filterDNSResponse(ctx)
if err != nil {
ctx.err = err
return resultError
}
if ctx.result != nil {
ctx.origResp = origResp2 // matched by response
} else {
ctx.result = &dnsfilter.Result{}
} </s> remove } else if res.Reason != dnsfilter.NotFilteredWhiteList && protectionEnabled {
origResp2 := d.Res
res, err = s.filterDNSResponse(d, setts)
if err != nil {
return err
}
if res != nil {
origResp = origResp2 // matched by response
} else {
res = &dnsfilter.Result{}
}
</s> add if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
d.Req.Question[0] = ctx.origQuestion
d.Res.Question[0] = ctx.origQuestion
if len(d.Res.Answer) != 0 {
answer := []dns.RR{}
answer = append(answer, s.genCNAMEAnswer(d.Req, res.CanonName))
answer = append(answer, d.Res.Answer...) // host -> IP
d.Res.Answer = answer </s> remove res := &dnsfilter.Result{}
protectionEnabled := s.conf.ProtectionEnabled && s.dnsFilter != nil
if protectionEnabled {
setts = s.getClientRequestFilteringSettings(d)
res, err = s.filterDNSRequest(d, setts)
</s> add ctx.protectionEnabled = s.conf.ProtectionEnabled && s.dnsFilter != nil
if ctx.protectionEnabled {
ctx.setts = s.getClientRequestFilteringSettings(d)
ctx.result, err = s.filterDNSRequest(ctx) </s> remove if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
answer = append(answer, s.genCNAMEAnswer(d.Req, res.CanonName))
// resolve canonical name, not the original host name
d.Req.Question[0].Name = dns.Fqdn(res.CanonName)
</s> add if d.Addr != nil && s.conf.GetUpstreamsByClient != nil {
clientIP := ipFromAddr(d.Addr)
upstreams := s.conf.GetUpstreamsByClient(clientIP)
if len(upstreams) > 0 {
log.Debug("Using custom upstreams for %s", clientIP)
d.Upstreams = upstreams </s> remove if len(d.Res.Answer) != 0 {
answer = append(answer, d.Res.Answer...) // host -> IP
d.Res.Answer = answer
}
</s> add if !ctx.responseFromUpstream {
return resultDone // don't process response if it's not from upstream servers
} | https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e | dnsforward/dnsforward.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask> s.queryLog.Add(p)
<mask> }
<mask>
<mask> s.updateStats(d, elapsed, *res)
<mask> s.RUnlock()
<mask>
<mask> return nil
<mask> }
<mask>
</s> Merge: * dns: refactor
Squashed commit of the following:
commit e9469266cafa3df537b5a4d5e28ca51db8289a34
Merge: 17cf6d60 e7e946fa
Author: Simon Zolin <[email protected]>
Date: Tue Jan 21 13:04:30 2020 +0300
Merge remote-tracking branch 'origin/master' into refactor
commit 17cf6d60d11602df3837316119ba8828f41a95df
Author: Simon Zolin <[email protected]>
Date: Mon Jan 20 15:25:43 2020 +0300
minor
commit 7b79462ebbeb743a10417bd28ceb70262ff9fa5c
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 17:50:09 2020 +0300
minor
commit d8b175c7eda36005c0277e7876f0f0a55a661b05
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 15:30:37 2020 +0300
minor
commit 93370aa32aa560d42fc67c95fd13f027ddc01b94
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 14:28:14 2020 +0300
* dns: refactor
. introduce a local context object
. move filtering, upstream logic, stats, querylog code to separate functions </s> remove return err
</s> add ctx.err = err
return resultError </s> remove res, err := s.dnsFilter.CheckHostRules(host, d.Req.Question[0].Qtype, setts)
</s> add res, err := s.dnsFilter.CheckHostRules(host, d.Req.Question[0].Qtype, ctx.setts) </s> remove OrigAnswer: origResp,
Result: res,
</s> add OrigAnswer: ctx.origResp,
Result: ctx.result, </s> remove res := &dnsfilter.Result{}
protectionEnabled := s.conf.ProtectionEnabled && s.dnsFilter != nil
if protectionEnabled {
setts = s.getClientRequestFilteringSettings(d)
res, err = s.filterDNSRequest(d, setts)
</s> add ctx.protectionEnabled = s.conf.ProtectionEnabled && s.dnsFilter != nil
if ctx.protectionEnabled {
ctx.setts = s.getClientRequestFilteringSettings(d)
ctx.result, err = s.filterDNSRequest(ctx) </s> remove return nil
</s> add return resultFinish </s> remove if d.Res != nil {
d.Res.Compress = true // some devices require DNS message compression
</s> add } else if res.Reason != dnsfilter.NotFilteredWhiteList && ctx.protectionEnabled {
origResp2 := d.Res
ctx.result, err = s.filterDNSResponse(ctx)
if err != nil {
ctx.err = err
return resultError
}
if ctx.result != nil {
ctx.origResp = origResp2 // matched by response
} else {
ctx.result = &dnsfilter.Result{}
} | https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e | dnsforward/dnsforward.go |
keep keep keep keep replace keep keep replace keep keep | <mask> return &setts
<mask> }
<mask>
<mask> // filterDNSRequest applies the dnsFilter and sets d.Res if the request was filtered
<mask> func (s *Server) filterDNSRequest(d *proxy.DNSContext, setts *dnsfilter.RequestFilteringSettings) (*dnsfilter.Result, error) {
<mask> req := d.Req
<mask> host := strings.TrimSuffix(req.Question[0].Name, ".")
<mask> res, err := s.dnsFilter.CheckHost(host, d.Req.Question[0].Qtype, setts)
<mask> if err != nil {
<mask> // Return immediately if there's an error
</s> Merge: * dns: refactor
Squashed commit of the following:
commit e9469266cafa3df537b5a4d5e28ca51db8289a34
Merge: 17cf6d60 e7e946fa
Author: Simon Zolin <[email protected]>
Date: Tue Jan 21 13:04:30 2020 +0300
Merge remote-tracking branch 'origin/master' into refactor
commit 17cf6d60d11602df3837316119ba8828f41a95df
Author: Simon Zolin <[email protected]>
Date: Mon Jan 20 15:25:43 2020 +0300
minor
commit 7b79462ebbeb743a10417bd28ceb70262ff9fa5c
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 17:50:09 2020 +0300
minor
commit d8b175c7eda36005c0277e7876f0f0a55a661b05
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 15:30:37 2020 +0300
minor
commit 93370aa32aa560d42fc67c95fd13f027ddc01b94
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 14:28:14 2020 +0300
* dns: refactor
. introduce a local context object
. move filtering, upstream logic, stats, querylog code to separate functions </s> remove func (s *Server) filterDNSResponse(d *proxy.DNSContext, setts *dnsfilter.RequestFilteringSettings) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSResponse(ctx *dnsContext) (*dnsfilter.Result, error) {
d := ctx.proxyCtx </s> remove if d.Addr != nil && s.conf.GetUpstreamsByClient != nil {
clientIP := ipFromAddr(d.Addr)
upstreams := s.conf.GetUpstreamsByClient(clientIP)
if len(upstreams) > 0 {
log.Debug("Using custom upstreams for %s", clientIP)
d.Upstreams = upstreams
}
}
</s> add // request was not filtered so let it be processed further
err := s.dnsProxy.Resolve(d)
if err != nil {
ctx.err = err
return resultError
} </s> remove res, err := s.dnsFilter.CheckHostRules(host, d.Req.Question[0].Qtype, setts)
</s> add res, err := s.dnsFilter.CheckHostRules(host, d.Req.Question[0].Qtype, ctx.setts) </s> remove res := &dnsfilter.Result{}
protectionEnabled := s.conf.ProtectionEnabled && s.dnsFilter != nil
if protectionEnabled {
setts = s.getClientRequestFilteringSettings(d)
res, err = s.filterDNSRequest(d, setts)
</s> add ctx.protectionEnabled = s.conf.ProtectionEnabled && s.dnsFilter != nil
if ctx.protectionEnabled {
ctx.setts = s.getClientRequestFilteringSettings(d)
ctx.result, err = s.filterDNSRequest(ctx) </s> remove var origResp *dns.Msg
if d.Res == nil {
answer := []dns.RR{}
originalQuestion := d.Req.Question[0]
</s> add // Pass request to upstream servers; process the response
func processUpstream(ctx *dnsContext) int {
s := ctx.srv
d := ctx.proxyCtx
if d.Res != nil {
return resultDone // response is already set - nothing to do
} | https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e | dnsforward/dnsforward.go |
keep keep keep add keep keep keep keep keep keep | <mask> }
<mask> }
<mask>
<mask> d.Res = resp
<mask> }
<mask>
<mask> return &res, err
<mask> }
<mask>
<mask> // If response contains CNAME, A or AAAA records, we apply filtering to each canonical host name or IP address.
</s> Merge: * dns: refactor
Squashed commit of the following:
commit e9469266cafa3df537b5a4d5e28ca51db8289a34
Merge: 17cf6d60 e7e946fa
Author: Simon Zolin <[email protected]>
Date: Tue Jan 21 13:04:30 2020 +0300
Merge remote-tracking branch 'origin/master' into refactor
commit 17cf6d60d11602df3837316119ba8828f41a95df
Author: Simon Zolin <[email protected]>
Date: Mon Jan 20 15:25:43 2020 +0300
minor
commit 7b79462ebbeb743a10417bd28ceb70262ff9fa5c
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 17:50:09 2020 +0300
minor
commit d8b175c7eda36005c0277e7876f0f0a55a661b05
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 15:30:37 2020 +0300
minor
commit 93370aa32aa560d42fc67c95fd13f027ddc01b94
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 14:28:14 2020 +0300
* dns: refactor
. introduce a local context object
. move filtering, upstream logic, stats, querylog code to separate functions </s> remove func (s *Server) filterDNSResponse(d *proxy.DNSContext, setts *dnsfilter.RequestFilteringSettings) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSResponse(ctx *dnsContext) (*dnsfilter.Result, error) {
d := ctx.proxyCtx </s> remove if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
d.Req.Question[0] = originalQuestion
d.Res.Question[0] = originalQuestion
</s> add // Apply filtering logic after we have received response from upstream servers
func processFilteringAfterResponse(ctx *dnsContext) int {
s := ctx.srv
d := ctx.proxyCtx
res := ctx.result
var err error </s> remove // use dnsfilter before cache -- changed settings or filters would require cache invalidation otherwise
</s> add return resultDone
}
// Apply filtering logic
func processFilteringBeforeRequest(ctx *dnsContext) int {
s := ctx.srv
d := ctx.proxyCtx
</s> remove var origResp *dns.Msg
if d.Res == nil {
answer := []dns.RR{}
originalQuestion := d.Req.Question[0]
</s> add // Pass request to upstream servers; process the response
func processUpstream(ctx *dnsContext) int {
s := ctx.srv
d := ctx.proxyCtx
if d.Res != nil {
return resultDone // response is already set - nothing to do
} </s> remove } else if res.Reason != dnsfilter.NotFilteredWhiteList && protectionEnabled {
origResp2 := d.Res
res, err = s.filterDNSResponse(d, setts)
if err != nil {
return err
}
if res != nil {
origResp = origResp2 // matched by response
} else {
res = &dnsfilter.Result{}
}
</s> add if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
d.Req.Question[0] = ctx.origQuestion
d.Res.Question[0] = ctx.origQuestion
if len(d.Res.Answer) != 0 {
answer := []dns.RR{}
answer = append(answer, s.genCNAMEAnswer(d.Req, res.CanonName))
answer = append(answer, d.Res.Answer...) // host -> IP
d.Res.Answer = answer </s> remove if d.Addr != nil && s.conf.GetUpstreamsByClient != nil {
clientIP := ipFromAddr(d.Addr)
upstreams := s.conf.GetUpstreamsByClient(clientIP)
if len(upstreams) > 0 {
log.Debug("Using custom upstreams for %s", clientIP)
d.Upstreams = upstreams
}
}
</s> add // request was not filtered so let it be processed further
err := s.dnsProxy.Resolve(d)
if err != nil {
ctx.err = err
return resultError
} | https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e | dnsforward/dnsforward.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> // If response contains CNAME, A or AAAA records, we apply filtering to each canonical host name or IP address.
<mask> // If this is a match, we set a new response in d.Res and return.
<mask> func (s *Server) filterDNSResponse(d *proxy.DNSContext, setts *dnsfilter.RequestFilteringSettings) (*dnsfilter.Result, error) {
<mask> for _, a := range d.Res.Answer {
<mask> host := ""
<mask>
<mask> switch v := a.(type) {
<mask> case *dns.CNAME:
</s> Merge: * dns: refactor
Squashed commit of the following:
commit e9469266cafa3df537b5a4d5e28ca51db8289a34
Merge: 17cf6d60 e7e946fa
Author: Simon Zolin <[email protected]>
Date: Tue Jan 21 13:04:30 2020 +0300
Merge remote-tracking branch 'origin/master' into refactor
commit 17cf6d60d11602df3837316119ba8828f41a95df
Author: Simon Zolin <[email protected]>
Date: Mon Jan 20 15:25:43 2020 +0300
minor
commit 7b79462ebbeb743a10417bd28ceb70262ff9fa5c
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 17:50:09 2020 +0300
minor
commit d8b175c7eda36005c0277e7876f0f0a55a661b05
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 15:30:37 2020 +0300
minor
commit 93370aa32aa560d42fc67c95fd13f027ddc01b94
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 14:28:14 2020 +0300
* dns: refactor
. introduce a local context object
. move filtering, upstream logic, stats, querylog code to separate functions </s> add } else if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
ctx.origQuestion = d.Req.Question[0]
// resolve canonical name, not the original host name
d.Req.Question[0].Name = dns.Fqdn(res.CanonName) </s> remove func (s *Server) filterDNSRequest(d *proxy.DNSContext, setts *dnsfilter.RequestFilteringSettings) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSRequest(ctx *dnsContext) (*dnsfilter.Result, error) {
d := ctx.proxyCtx </s> remove res, err := s.dnsFilter.CheckHost(host, d.Req.Question[0].Qtype, setts)
</s> add res, err := s.dnsFilter.CheckHost(host, d.Req.Question[0].Qtype, ctx.setts) </s> remove if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
d.Req.Question[0] = originalQuestion
d.Res.Question[0] = originalQuestion
</s> add // Apply filtering logic after we have received response from upstream servers
func processFilteringAfterResponse(ctx *dnsContext) int {
s := ctx.srv
d := ctx.proxyCtx
res := ctx.result
var err error </s> remove var origResp *dns.Msg
if d.Res == nil {
answer := []dns.RR{}
originalQuestion := d.Req.Question[0]
</s> add // Pass request to upstream servers; process the response
func processUpstream(ctx *dnsContext) int {
s := ctx.srv
d := ctx.proxyCtx
if d.Res != nil {
return resultDone // response is already set - nothing to do
} </s> remove // handleDNSRequest filters the incoming DNS requests and writes them to the query log
// nolint (gocyclo)
func (s *Server) handleDNSRequest(p *proxy.Proxy, d *proxy.DNSContext) error {
start := time.Now()
</s> add // To transfer information between modules
type dnsContext struct {
srv *Server
proxyCtx *proxy.DNSContext
setts *dnsfilter.RequestFilteringSettings // filtering settings for this client
startTime time.Time
result *dnsfilter.Result
origResp *dns.Msg // response received from upstream servers. Set when response is modified by filtering
origQuestion dns.Question // question received from client. Set when Rewrites are used.
err error // error returned from the module
protectionEnabled bool // filtering is enabled, dnsfilter object is ready
responseFromUpstream bool // response is received from upstream servers
}
const (
resultDone = iota // module has completed its job, continue
resultFinish // module has completed its job, exit normally
resultError // an error occurred, exit with an error
) | https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e | dnsforward/dnsforward.go |
keep keep keep keep replace keep keep keep keep keep | <mask> if !s.conf.ProtectionEnabled || s.dnsFilter == nil {
<mask> s.RUnlock()
<mask> continue
<mask> }
<mask> res, err := s.dnsFilter.CheckHostRules(host, d.Req.Question[0].Qtype, setts)
<mask> s.RUnlock()
<mask>
<mask> if err != nil {
<mask> return nil, err
<mask>
</s> Merge: * dns: refactor
Squashed commit of the following:
commit e9469266cafa3df537b5a4d5e28ca51db8289a34
Merge: 17cf6d60 e7e946fa
Author: Simon Zolin <[email protected]>
Date: Tue Jan 21 13:04:30 2020 +0300
Merge remote-tracking branch 'origin/master' into refactor
commit 17cf6d60d11602df3837316119ba8828f41a95df
Author: Simon Zolin <[email protected]>
Date: Mon Jan 20 15:25:43 2020 +0300
minor
commit 7b79462ebbeb743a10417bd28ceb70262ff9fa5c
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 17:50:09 2020 +0300
minor
commit d8b175c7eda36005c0277e7876f0f0a55a661b05
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 15:30:37 2020 +0300
minor
commit 93370aa32aa560d42fc67c95fd13f027ddc01b94
Author: Simon Zolin <[email protected]>
Date: Fri Jan 17 14:28:14 2020 +0300
* dns: refactor
. introduce a local context object
. move filtering, upstream logic, stats, querylog code to separate functions </s> remove return err
</s> add ctx.err = err
return resultError </s> remove res := &dnsfilter.Result{}
protectionEnabled := s.conf.ProtectionEnabled && s.dnsFilter != nil
if protectionEnabled {
setts = s.getClientRequestFilteringSettings(d)
res, err = s.filterDNSRequest(d, setts)
</s> add ctx.protectionEnabled = s.conf.ProtectionEnabled && s.dnsFilter != nil
if ctx.protectionEnabled {
ctx.setts = s.getClientRequestFilteringSettings(d)
ctx.result, err = s.filterDNSRequest(ctx) </s> remove res, err := s.dnsFilter.CheckHost(host, d.Req.Question[0].Qtype, setts)
</s> add res, err := s.dnsFilter.CheckHost(host, d.Req.Question[0].Qtype, ctx.setts) </s> remove func (s *Server) filterDNSRequest(d *proxy.DNSContext, setts *dnsfilter.RequestFilteringSettings) (*dnsfilter.Result, error) {
</s> add func (s *Server) filterDNSRequest(ctx *dnsContext) (*dnsfilter.Result, error) {
d := ctx.proxyCtx </s> remove if len(d.Res.Answer) != 0 {
answer = append(answer, d.Res.Answer...) // host -> IP
d.Res.Answer = answer
}
</s> add if !ctx.responseFromUpstream {
return resultDone // don't process response if it's not from upstream servers
} </s> remove } else if res.Reason != dnsfilter.NotFilteredWhiteList && protectionEnabled {
origResp2 := d.Res
res, err = s.filterDNSResponse(d, setts)
if err != nil {
return err
}
if res != nil {
origResp = origResp2 // matched by response
} else {
res = &dnsfilter.Result{}
}
</s> add if res.Reason == dnsfilter.ReasonRewrite && len(res.CanonName) != 0 {
d.Req.Question[0] = ctx.origQuestion
d.Res.Question[0] = ctx.origQuestion
if len(d.Res.Answer) != 0 {
answer := []dns.RR{}
answer = append(answer, s.genCNAMEAnswer(d.Req, res.CanonName))
answer = append(answer, d.Res.Answer...) // host -> IP
d.Res.Answer = answer | https://github.com/AdguardTeam/AdGuardHome/commit/3f7e2f7241caa0cf0847579efefaa276e273f89e | dnsforward/dnsforward.go |
keep keep add keep keep keep keep keep keep | <mask> coreFile string
<mask> FilterFile string `yaml:"-"`
<mask> Port int `yaml:"port"`
<mask> FilteringEnabled bool `yaml:"filtering_enabled"`
<mask> SafeBrowsingEnabled bool `yaml:"safebrowsing_enabled"`
<mask> SafeSearchEnabled bool `yaml:"safesearch_enabled"`
<mask> ParentalEnabled bool `yaml:"parental_enabled"`
<mask> ParentalSensitivity int `yaml:"parental_sensitivity"`
<mask> BlockedResponseTTL int `yaml:"blocked_response_ttl"`
</s> API backend -- implement ability to turn toggle all protection in one go, helpful to temporarily disable all kinds of filtering </s> remove err = writeAllConfigs()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
</s> add </s> add ProtectionEnabled: true, </s> remove dnsfilter {{if .FilteringEnabled}}{{.FilterFile}}{{end}} {
</s> add {{if .ProtectionEnabled}}dnsfilter {{if .FilteringEnabled}}{{.FilterFile}}{{end}} { </s> remove }
</s> add }{{end}} </s> remove "running": isRunning(),
"version": VersionString,
"dns_address": config.BindHost,
"dns_port": config.CoreDNS.Port,
"querylog_enabled": config.CoreDNS.QueryLogEnabled,
"upstream_dns": config.CoreDNS.UpstreamDNS,
</s> add "dns_address": config.BindHost,
"dns_port": config.CoreDNS.Port,
"protection_enabled": config.CoreDNS.ProtectionEnabled,
"querylog_enabled": config.CoreDNS.QueryLogEnabled,
"running": isRunning(),
"upstream_dns": config.CoreDNS.UpstreamDNS,
"version": VersionString, </s> add func handleProtectionEnable(w http.ResponseWriter, r *http.Request) {
config.CoreDNS.ProtectionEnabled = true
httpUpdateConfigReloadDNSReturnOK(w, r)
}
func handleProtectionDisable(w http.ResponseWriter, r *http.Request) {
config.CoreDNS.ProtectionEnabled = false
httpUpdateConfigReloadDNSReturnOK(w, r)
}
| https://github.com/AdguardTeam/AdGuardHome/commit/413228e6ecaf9019c8eac7034f1404b5c9c497fd | config.go |
keep keep keep add keep keep keep keep keep | <mask> Port: 53,
<mask> binaryFile: "coredns", // only filename, no path
<mask> coreFile: "Corefile", // only filename, no path
<mask> FilterFile: "dnsfilter.txt", // only filename, no path
<mask> FilteringEnabled: true,
<mask> SafeBrowsingEnabled: false,
<mask> BlockedResponseTTL: 60, // in seconds
<mask> QueryLogEnabled: true,
<mask> UpstreamDNS: defaultDNS,
</s> API backend -- implement ability to turn toggle all protection in one go, helpful to temporarily disable all kinds of filtering </s> add func handleProtectionEnable(w http.ResponseWriter, r *http.Request) {
config.CoreDNS.ProtectionEnabled = true
httpUpdateConfigReloadDNSReturnOK(w, r)
}
func handleProtectionDisable(w http.ResponseWriter, r *http.Request) {
config.CoreDNS.ProtectionEnabled = false
httpUpdateConfigReloadDNSReturnOK(w, r)
}
</s> remove err = writeAllConfigs()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
</s> add </s> remove tellCoreDNSToReload()
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
// TODO: regenerate coredns config and tell coredns to reload it if it's running
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) | https://github.com/AdguardTeam/AdGuardHome/commit/413228e6ecaf9019c8eac7034f1404b5c9c497fd | config.go |
keep keep keep keep replace keep keep keep keep keep | <mask> return nil
<mask> }
<mask>
<mask> const coreDNSConfigTemplate = `. {
<mask> dnsfilter {{if .FilteringEnabled}}{{.FilterFile}}{{end}} {
<mask> {{if .SafeBrowsingEnabled}}safebrowsing{{end}}
<mask> {{if .ParentalEnabled}}parental {{.ParentalSensitivity}}{{end}}
<mask> {{if .SafeSearchEnabled}}safesearch{{end}}
<mask> {{if .QueryLogEnabled}}querylog{{end}}
<mask> blocked_ttl {{.BlockedResponseTTL}}
</s> API backend -- implement ability to turn toggle all protection in one go, helpful to temporarily disable all kinds of filtering </s> remove }
</s> add }{{end}} </s> remove err = writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err = writeAllConfigs()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
</s> add </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err = writeAllConfigs()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
</s> add </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) | https://github.com/AdguardTeam/AdGuardHome/commit/413228e6ecaf9019c8eac7034f1404b5c9c497fd | config.go |
keep keep keep keep replace keep keep keep keep keep | <mask> {{if .ParentalEnabled}}parental {{.ParentalSensitivity}}{{end}}
<mask> {{if .SafeSearchEnabled}}safesearch{{end}}
<mask> {{if .QueryLogEnabled}}querylog{{end}}
<mask> blocked_ttl {{.BlockedResponseTTL}}
<mask> }
<mask> {{.Pprof}}
<mask> hosts {
<mask> fallthrough
<mask> }
<mask> {{if .UpstreamDNS}}forward . {{range .UpstreamDNS}}{{.}} {{end}}{{end}}
</s> API backend -- implement ability to turn toggle all protection in one go, helpful to temporarily disable all kinds of filtering </s> remove dnsfilter {{if .FilteringEnabled}}{{.FilterFile}}{{end}} {
</s> add {{if .ProtectionEnabled}}dnsfilter {{if .FilteringEnabled}}{{.FilterFile}}{{end}} { </s> add func handleProtectionEnable(w http.ResponseWriter, r *http.Request) {
config.CoreDNS.ProtectionEnabled = true
httpUpdateConfigReloadDNSReturnOK(w, r)
}
func handleProtectionDisable(w http.ResponseWriter, r *http.Request) {
config.CoreDNS.ProtectionEnabled = false
httpUpdateConfigReloadDNSReturnOK(w, r)
}
</s> remove tellCoreDNSToReload()
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove tellCoreDNSToReload()
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove tellCoreDNSToReload()
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) | https://github.com/AdguardTeam/AdGuardHome/commit/413228e6ecaf9019c8eac7034f1404b5c9c497fd | config.go |
keep keep keep keep replace replace replace replace replace replace keep keep keep keep keep | <mask> }
<mask>
<mask> func handleStatus(w http.ResponseWriter, r *http.Request) {
<mask> data := map[string]interface{}{
<mask> "running": isRunning(),
<mask> "version": VersionString,
<mask> "dns_address": config.BindHost,
<mask> "dns_port": config.CoreDNS.Port,
<mask> "querylog_enabled": config.CoreDNS.QueryLogEnabled,
<mask> "upstream_dns": config.CoreDNS.UpstreamDNS,
<mask> }
<mask>
<mask> json, err := json.Marshal(data)
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Unable to marshal status json: %s", err)
</s> API backend -- implement ability to turn toggle all protection in one go, helpful to temporarily disable all kinds of filtering </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) | https://github.com/AdguardTeam/AdGuardHome/commit/413228e6ecaf9019c8eac7034f1404b5c9c497fd | control.go |
keep add keep keep keep keep keep | <mask> }
<mask>
<mask> // -----
<mask> // stats
<mask> // -----
<mask> func handleStats(w http.ResponseWriter, r *http.Request) {
<mask> resp, err := client.Get("http://127.0.0.1:8618/stats")
</s> API backend -- implement ability to turn toggle all protection in one go, helpful to temporarily disable all kinds of filtering </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove tellCoreDNSToReload()
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
// TODO: regenerate coredns config and tell coredns to reload it if it's running
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) | https://github.com/AdguardTeam/AdGuardHome/commit/413228e6ecaf9019c8eac7034f1404b5c9c497fd | control.go |
keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep | <mask>
<mask> func handleQueryLogEnable(w http.ResponseWriter, r *http.Request) {
<mask> config.CoreDNS.QueryLogEnabled = true
<mask> err := writeAllConfigsAndReloadCoreDNS()
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write config file: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> return
<mask> }
<mask> _, err = fmt.Fprintf(w, "OK\n")
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write body: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> }
<mask> }
<mask>
<mask> func handleQueryLogDisable(w http.ResponseWriter, r *http.Request) {
<mask> config.CoreDNS.QueryLogEnabled = false
<mask> err := writeAllConfigsAndReloadCoreDNS()
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write config file: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> return
<mask> }
<mask> _, err = fmt.Fprintf(w, "OK\n")
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write body: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> }
<mask>
<mask> }
<mask>
<mask> func handleStatsReset(w http.ResponseWriter, r *http.Request) {
<mask> resp, err := client.Post("http://127.0.0.1:8618/stats_reset", "text/plain", nil)
</s> API backend -- implement ability to turn toggle all protection in one go, helpful to temporarily disable all kinds of filtering </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err = writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) | https://github.com/AdguardTeam/AdGuardHome/commit/413228e6ecaf9019c8eac7034f1404b5c9c497fd | control.go |
keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep | <mask> func handleFilteringEnable(w http.ResponseWriter, r *http.Request) {
<mask> config.CoreDNS.FilteringEnabled = true
<mask> err := writeAllConfigsAndReloadCoreDNS()
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write config file: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> return
<mask> }
<mask> _, err = fmt.Fprintf(w, "OK\n")
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write body: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> }
<mask>
<mask> }
<mask>
<mask> func handleFilteringDisable(w http.ResponseWriter, r *http.Request) {
<mask> config.CoreDNS.FilteringEnabled = false
<mask> err := writeAllConfigsAndReloadCoreDNS()
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write config file: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> return
<mask> }
<mask> _, err = fmt.Fprintf(w, "OK\n")
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write body: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> }
<mask>
<mask> }
<mask>
<mask> func handleFilteringStatus(w http.ResponseWriter, r *http.Request) {
</s> API backend -- implement ability to turn toggle all protection in one go, helpful to temporarily disable all kinds of filtering </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err = writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) | https://github.com/AdguardTeam/AdGuardHome/commit/413228e6ecaf9019c8eac7034f1404b5c9c497fd | control.go |
keep keep keep keep replace replace replace replace replace replace replace keep keep keep keep keep | <mask> newFilters = append(newFilters, filter)
<mask> }
<mask> }
<mask> config.Filters = newFilters
<mask> err = writeAllConfigs()
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write config file: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> return
<mask> }
<mask> err = writeFilterFile()
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write filter file: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
</s> API backend -- implement ability to turn toggle all protection in one go, helpful to temporarily disable all kinds of filtering </s> remove err = writeAllConfigs()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
</s> add </s> remove err = writeAllConfigs()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
</s> add </s> remove err = writeAllConfigs()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
</s> add </s> remove err = writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) | https://github.com/AdguardTeam/AdGuardHome/commit/413228e6ecaf9019c8eac7034f1404b5c9c497fd | control.go |
keep keep keep keep replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> return
<mask> }
<mask> tellCoreDNSToReload()
<mask> _, err = fmt.Fprintf(w, "OK\n")
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write body: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> }
<mask>
<mask> }
<mask>
<mask> func handleFilteringEnableURL(w http.ResponseWriter, r *http.Request) {
<mask> parameters, err := parseParametersFromBody(r.Body)
<mask> if err != nil {
</s> API backend -- implement ability to turn toggle all protection in one go, helpful to temporarily disable all kinds of filtering </s> remove tellCoreDNSToReload()
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove tellCoreDNSToReload()
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) | https://github.com/AdguardTeam/AdGuardHome/commit/413228e6ecaf9019c8eac7034f1404b5c9c497fd | control.go |
keep keep keep keep replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> http.Error(w, "URL parameter was not previously added", http.StatusBadRequest)
<mask> return
<mask> }
<mask>
<mask> err = writeAllConfigs()
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write config file: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> return
<mask> }
<mask>
<mask> // kick off refresh of rules from new URLs
<mask> refreshFiltersIfNeccessary()
<mask> err = writeFilterFile()
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write filter file: %s", err)
</s> API backend -- implement ability to turn toggle all protection in one go, helpful to temporarily disable all kinds of filtering </s> remove err = writeAllConfigs()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
</s> add </s> remove err = writeAllConfigs()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
</s> add </s> remove err = writeAllConfigs()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
</s> add </s> remove err = writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) | https://github.com/AdguardTeam/AdGuardHome/commit/413228e6ecaf9019c8eac7034f1404b5c9c497fd | control.go |
keep keep keep keep replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> return
<mask> }
<mask> tellCoreDNSToReload()
<mask> _, err = fmt.Fprintf(w, "OK\n")
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write body: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> }
<mask>
<mask> }
<mask>
<mask> func handleFilteringDisableURL(w http.ResponseWriter, r *http.Request) {
<mask> parameters, err := parseParametersFromBody(r.Body)
<mask> if err != nil {
</s> API backend -- implement ability to turn toggle all protection in one go, helpful to temporarily disable all kinds of filtering </s> remove tellCoreDNSToReload()
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove tellCoreDNSToReload()
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) | https://github.com/AdguardTeam/AdGuardHome/commit/413228e6ecaf9019c8eac7034f1404b5c9c497fd | control.go |
keep keep keep keep replace replace replace replace replace replace replace keep keep keep keep keep | <mask> http.Error(w, "URL parameter was not previously added", http.StatusBadRequest)
<mask> return
<mask> }
<mask>
<mask> err = writeAllConfigs()
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write config file: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> return
<mask> }
<mask> err = writeFilterFile()
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write filter file: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
</s> API backend -- implement ability to turn toggle all protection in one go, helpful to temporarily disable all kinds of filtering </s> remove err = writeAllConfigs()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
</s> add </s> remove err = writeAllConfigs()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
</s> add </s> remove err = writeAllConfigs()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
</s> add </s> remove err = writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) | https://github.com/AdguardTeam/AdGuardHome/commit/413228e6ecaf9019c8eac7034f1404b5c9c497fd | control.go |
keep keep keep keep replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> return
<mask> }
<mask> tellCoreDNSToReload()
<mask> _, err = fmt.Fprintf(w, "OK\n")
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write body: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> }
<mask>
<mask> // TODO: regenerate coredns config and tell coredns to reload it if it's running
<mask> }
<mask>
<mask> func handleFilteringSetRules(w http.ResponseWriter, r *http.Request) {
<mask> body, err := ioutil.ReadAll(r.Body)
<mask> if err != nil {
</s> API backend -- implement ability to turn toggle all protection in one go, helpful to temporarily disable all kinds of filtering </s> remove tellCoreDNSToReload()
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove tellCoreDNSToReload()
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove tellCoreDNSToReload()
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) | https://github.com/AdguardTeam/AdGuardHome/commit/413228e6ecaf9019c8eac7034f1404b5c9c497fd | control.go |
keep keep keep keep replace replace replace replace replace replace replace keep keep keep keep keep | <mask> return
<mask> }
<mask>
<mask> config.UserRules = strings.Split(string(body), "\n")
<mask> err = writeAllConfigs()
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write config file: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> return
<mask> }
<mask> err = writeFilterFile()
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write filter file: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
</s> API backend -- implement ability to turn toggle all protection in one go, helpful to temporarily disable all kinds of filtering </s> remove err = writeAllConfigs()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
</s> add </s> remove err = writeAllConfigs()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
</s> add </s> remove err = writeAllConfigs()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
</s> add </s> remove err = writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) | https://github.com/AdguardTeam/AdGuardHome/commit/413228e6ecaf9019c8eac7034f1404b5c9c497fd | control.go |
keep keep keep keep replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> return
<mask> }
<mask> tellCoreDNSToReload()
<mask> _, err = fmt.Fprintf(w, "OK\n")
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write body: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> }
<mask>
<mask> }
<mask>
<mask> func handleFilteringRefresh(w http.ResponseWriter, r *http.Request) {
<mask> force := r.URL.Query().Get("force")
<mask> if force != "" {
</s> API backend -- implement ability to turn toggle all protection in one go, helpful to temporarily disable all kinds of filtering </s> remove tellCoreDNSToReload()
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove tellCoreDNSToReload()
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) | https://github.com/AdguardTeam/AdGuardHome/commit/413228e6ecaf9019c8eac7034f1404b5c9c497fd | control.go |
keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep | <mask>
<mask> func handleSafeBrowsingEnable(w http.ResponseWriter, r *http.Request) {
<mask> config.CoreDNS.SafeBrowsingEnabled = true
<mask> err := writeAllConfigsAndReloadCoreDNS()
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write config file: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> return
<mask> }
<mask> _, err = fmt.Fprintf(w, "OK\n")
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write body: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> }
<mask>
<mask> }
<mask>
<mask> func handleSafeBrowsingDisable(w http.ResponseWriter, r *http.Request) {
<mask> config.CoreDNS.SafeBrowsingEnabled = false
<mask> err := writeAllConfigsAndReloadCoreDNS()
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write config file: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> return
<mask> }
<mask> _, err = fmt.Fprintf(w, "OK\n")
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write body: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> }
<mask>
<mask> }
<mask>
</s> API backend -- implement ability to turn toggle all protection in one go, helpful to temporarily disable all kinds of filtering </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err = writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) | https://github.com/AdguardTeam/AdGuardHome/commit/413228e6ecaf9019c8eac7034f1404b5c9c497fd | control.go |
keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep | <mask> config.CoreDNS.ParentalEnabled = true
<mask> err = writeAllConfigsAndReloadCoreDNS()
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write config file: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> return
<mask> }
<mask> _, err = fmt.Fprintf(w, "OK\n")
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write body: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> }
<mask>
<mask> }
<mask>
<mask> func handleParentalDisable(w http.ResponseWriter, r *http.Request) {
<mask> config.CoreDNS.ParentalEnabled = false
<mask> err := writeAllConfigsAndReloadCoreDNS()
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write config file: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> return
<mask> }
<mask> _, err = fmt.Fprintf(w, "OK\n")
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write body: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> }
<mask>
<mask> }
</s> API backend -- implement ability to turn toggle all protection in one go, helpful to temporarily disable all kinds of filtering </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) | https://github.com/AdguardTeam/AdGuardHome/commit/413228e6ecaf9019c8eac7034f1404b5c9c497fd | control.go |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep | <mask> // ------------
<mask>
<mask> func handleSafeSearchEnable(w http.ResponseWriter, r *http.Request) {
<mask> config.CoreDNS.SafeSearchEnabled = true
<mask> err := writeAllConfigsAndReloadCoreDNS()
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write config file: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> return
<mask> }
<mask> _, err = fmt.Fprintf(w, "OK\n")
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write body: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> }
<mask>
<mask> }
<mask>
<mask> func handleSafeSearchDisable(w http.ResponseWriter, r *http.Request) {
<mask> config.CoreDNS.SafeSearchEnabled = false
<mask> err := writeAllConfigsAndReloadCoreDNS()
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write config file: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> return
<mask> }
<mask> _, err = fmt.Fprintf(w, "OK\n")
<mask> if err != nil {
<mask> errortext := fmt.Sprintf("Couldn't write body: %s", err)
<mask> log.Println(errortext)
<mask> http.Error(w, errortext, http.StatusInternalServerError)
<mask> }
<mask>
<mask> }
<mask>
</s> API backend -- implement ability to turn toggle all protection in one go, helpful to temporarily disable all kinds of filtering </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err = writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) | https://github.com/AdguardTeam/AdGuardHome/commit/413228e6ecaf9019c8eac7034f1404b5c9c497fd | control.go |
keep keep keep keep replace replace replace replace keep keep keep keep keep | <mask> http.HandleFunc("/control/start", optionalAuth(ensurePOST(handleStart)))
<mask> http.HandleFunc("/control/stop", optionalAuth(ensurePOST(handleStop)))
<mask> http.HandleFunc("/control/restart", optionalAuth(ensurePOST(handleRestart)))
<mask> http.HandleFunc("/control/status", optionalAuth(ensureGET(handleStatus)))
<mask> http.HandleFunc("/control/stats", optionalAuth(ensureGET(handleStats)))
<mask> http.HandleFunc("/control/stats_history", optionalAuth(ensureGET(handleStatsHistory)))
<mask> http.HandleFunc("/control/stats_top", optionalAuth(ensureGET(handleStatsTop)))
<mask> http.HandleFunc("/control/stats_reset", optionalAuth(ensurePOST(handleStatsReset)))
<mask> http.HandleFunc("/control/querylog", optionalAuth(ensureGET(handleQueryLog)))
<mask> http.HandleFunc("/control/querylog_enable", optionalAuth(ensurePOST(handleQueryLogEnable)))
<mask> http.HandleFunc("/control/querylog_disable", optionalAuth(ensurePOST(handleQueryLogDisable)))
<mask> http.HandleFunc("/control/set_upstream_dns", optionalAuth(ensurePOST(handleSetUpstreamDNS)))
<mask> http.HandleFunc("/control/test_upstream_dns", optionalAuth(ensurePOST(handleTestUpstreamDNS)))
</s> API backend -- implement ability to turn toggle all protection in one go, helpful to temporarily disable all kinds of filtering </s> add http.HandleFunc("/control/stats_top", optionalAuth(ensureGET(handleStatsTop)))
http.HandleFunc("/control/stats", optionalAuth(ensureGET(handleStats)))
http.HandleFunc("/control/stats_history", optionalAuth(ensureGET(handleStatsHistory)))
http.HandleFunc("/control/stats_reset", optionalAuth(ensurePOST(handleStatsReset))) </s> remove http.HandleFunc("/control/filtering/status", optionalAuth(ensureGET(handleFilteringStatus)))
</s> add </s> add /stats_reset:
post:
tags:
-global
operationId: statsReset
summary: "Reset all statistics to zeroes"
responses:
200:
description: OK </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove tellCoreDNSToReload()
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err = writeAllConfigs()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/413228e6ecaf9019c8eac7034f1404b5c9c497fd | control.go |
keep add keep keep keep keep keep | <mask> http.HandleFunc("/control/set_upstream_dns", optionalAuth(ensurePOST(handleSetUpstreamDNS)))
<mask> http.HandleFunc("/control/test_upstream_dns", optionalAuth(ensurePOST(handleTestUpstreamDNS)))
<mask> http.HandleFunc("/control/version.json", optionalAuth(handleGetVersionJSON))
<mask> http.HandleFunc("/control/filtering/enable", optionalAuth(ensurePOST(handleFilteringEnable)))
<mask> http.HandleFunc("/control/filtering/disable", optionalAuth(ensurePOST(handleFilteringDisable)))
<mask> http.HandleFunc("/control/filtering/add_url", optionalAuth(ensurePUT(handleFilteringAddURL)))
<mask> http.HandleFunc("/control/filtering/remove_url", optionalAuth(ensureDELETE(handleFilteringRemoveURL)))
</s> API backend -- implement ability to turn toggle all protection in one go, helpful to temporarily disable all kinds of filtering </s> remove http.HandleFunc("/control/filtering/status", optionalAuth(ensureGET(handleFilteringStatus)))
</s> add </s> remove http.HandleFunc("/control/stats", optionalAuth(ensureGET(handleStats)))
http.HandleFunc("/control/stats_history", optionalAuth(ensureGET(handleStatsHistory)))
http.HandleFunc("/control/stats_top", optionalAuth(ensureGET(handleStatsTop)))
http.HandleFunc("/control/stats_reset", optionalAuth(ensurePOST(handleStatsReset)))
</s> add http.HandleFunc("/control/enable_protection", optionalAuth(ensurePOST(handleProtectionEnable)))
http.HandleFunc("/control/disable_protection", optionalAuth(ensurePOST(handleProtectionDisable))) </s> remove http.HandleFunc("/control/filtering/set_rules", optionalAuth(ensurePUT(handleFilteringSetRules)))
</s> add </s> add http.HandleFunc("/control/filtering/status", optionalAuth(ensureGET(handleFilteringStatus)))
http.HandleFunc("/control/filtering/set_rules", optionalAuth(ensurePUT(handleFilteringSetRules))) </s> add /stats_reset:
post:
tags:
-global
operationId: statsReset
summary: "Reset all statistics to zeroes"
responses:
200:
description: OK </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) | https://github.com/AdguardTeam/AdGuardHome/commit/413228e6ecaf9019c8eac7034f1404b5c9c497fd | control.go |
keep replace keep keep keep keep replace | <mask> http.HandleFunc("/control/filtering/disable", optionalAuth(ensurePOST(handleFilteringDisable)))
<mask> http.HandleFunc("/control/filtering/status", optionalAuth(ensureGET(handleFilteringStatus)))
<mask> http.HandleFunc("/control/filtering/add_url", optionalAuth(ensurePUT(handleFilteringAddURL)))
<mask> http.HandleFunc("/control/filtering/remove_url", optionalAuth(ensureDELETE(handleFilteringRemoveURL)))
<mask> http.HandleFunc("/control/filtering/enable_url", optionalAuth(ensurePOST(handleFilteringEnableURL)))
<mask> http.HandleFunc("/control/filtering/disable_url", optionalAuth(ensurePOST(handleFilteringDisableURL)))
<mask> http.HandleFunc("/control/filtering/set_rules", optionalAuth(ensurePUT(handleFilteringSetRules)))
</s> API backend -- implement ability to turn toggle all protection in one go, helpful to temporarily disable all kinds of filtering </s> add http.HandleFunc("/control/filtering/status", optionalAuth(ensureGET(handleFilteringStatus)))
http.HandleFunc("/control/filtering/set_rules", optionalAuth(ensurePUT(handleFilteringSetRules))) </s> add http.HandleFunc("/control/stats_top", optionalAuth(ensureGET(handleStatsTop)))
http.HandleFunc("/control/stats", optionalAuth(ensureGET(handleStats)))
http.HandleFunc("/control/stats_history", optionalAuth(ensureGET(handleStatsHistory)))
http.HandleFunc("/control/stats_reset", optionalAuth(ensurePOST(handleStatsReset))) </s> add /stats_reset:
post:
tags:
-global
operationId: statsReset
summary: "Reset all statistics to zeroes"
responses:
200:
description: OK </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err = writeAllConfigs()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/413228e6ecaf9019c8eac7034f1404b5c9c497fd | control.go |
keep keep keep add keep keep keep keep | <mask> http.HandleFunc("/control/filtering/remove_url", optionalAuth(ensureDELETE(handleFilteringRemoveURL)))
<mask> http.HandleFunc("/control/filtering/enable_url", optionalAuth(ensurePOST(handleFilteringEnableURL)))
<mask> http.HandleFunc("/control/filtering/disable_url", optionalAuth(ensurePOST(handleFilteringDisableURL)))
<mask> http.HandleFunc("/control/filtering/refresh", optionalAuth(ensurePOST(handleFilteringRefresh)))
<mask> http.HandleFunc("/control/safebrowsing/enable", optionalAuth(ensurePOST(handleSafeBrowsingEnable)))
<mask> http.HandleFunc("/control/safebrowsing/disable", optionalAuth(ensurePOST(handleSafeBrowsingDisable)))
<mask> http.HandleFunc("/control/safebrowsing/status", optionalAuth(ensureGET(handleSafeBrowsingStatus)))
<mask> http.HandleFunc("/control/parental/enable", optionalAuth(ensurePOST(handleParentalEnable)))
</s> API backend -- implement ability to turn toggle all protection in one go, helpful to temporarily disable all kinds of filtering </s> remove http.HandleFunc("/control/filtering/set_rules", optionalAuth(ensurePUT(handleFilteringSetRules)))
</s> add </s> remove http.HandleFunc("/control/filtering/status", optionalAuth(ensureGET(handleFilteringStatus)))
</s> add </s> add http.HandleFunc("/control/stats_top", optionalAuth(ensureGET(handleStatsTop)))
http.HandleFunc("/control/stats", optionalAuth(ensureGET(handleStats)))
http.HandleFunc("/control/stats_history", optionalAuth(ensureGET(handleStatsHistory)))
http.HandleFunc("/control/stats_reset", optionalAuth(ensurePOST(handleStatsReset))) </s> add /stats_reset:
post:
tags:
-global
operationId: statsReset
summary: "Reset all statistics to zeroes"
responses:
200:
description: OK </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err = writeAllConfigs()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/413228e6ecaf9019c8eac7034f1404b5c9c497fd | control.go |
keep add keep keep keep keep | <mask> dns_address: 127.0.0.1
<mask> dns_port: 53
<mask> querylog_enabled: true
<mask> running: true
<mask> upstream_dns:
<mask> - 1.1.1.1
</s> API backend -- implement ability to turn toggle all protection in one go, helpful to temporarily disable all kinds of filtering </s> add /stats_reset:
post:
tags:
-global
operationId: statsReset
summary: "Reset all statistics to zeroes"
responses:
200:
description: OK </s> add func handleProtectionEnable(w http.ResponseWriter, r *http.Request) {
config.CoreDNS.ProtectionEnabled = true
httpUpdateConfigReloadDNSReturnOK(w, r)
}
func handleProtectionDisable(w http.ResponseWriter, r *http.Request) {
config.CoreDNS.ProtectionEnabled = false
httpUpdateConfigReloadDNSReturnOK(w, r)
}
</s> remove err = writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) </s> remove err := writeAllConfigsAndReloadCoreDNS()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
_, err = fmt.Fprintf(w, "OK\n")
if err != nil {
errortext := fmt.Sprintf("Couldn't write body: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
}
</s> add httpUpdateConfigReloadDNSReturnOK(w, r) | https://github.com/AdguardTeam/AdGuardHome/commit/413228e6ecaf9019c8eac7034f1404b5c9c497fd | openapi.yaml |
keep keep keep add keep keep keep keep | <mask> - 123
<mask> - 123
<mask> - 123
<mask> - 123
<mask> /filtering/enable:
<mask> post:
<mask> tags:
<mask> - filtering
</s> API backend -- implement ability to turn toggle all protection in one go, helpful to temporarily disable all kinds of filtering </s> add protection_enabled: true </s> remove err = writeAllConfigs()
if err != nil {
errortext := fmt.Sprintf("Couldn't write config file: %s", err)
log.Println(errortext)
http.Error(w, errortext, http.StatusInternalServerError)
return
}
</s> add </s> add ProtectionEnabled: true, </s> remove dnsfilter {{if .FilteringEnabled}}{{.FilterFile}}{{end}} {
</s> add {{if .ProtectionEnabled}}dnsfilter {{if .FilteringEnabled}}{{.FilterFile}}{{end}} { </s> remove }
</s> add }{{end}} </s> remove "running": isRunning(),
"version": VersionString,
"dns_address": config.BindHost,
"dns_port": config.CoreDNS.Port,
"querylog_enabled": config.CoreDNS.QueryLogEnabled,
"upstream_dns": config.CoreDNS.UpstreamDNS,
</s> add "dns_address": config.BindHost,
"dns_port": config.CoreDNS.Port,
"protection_enabled": config.CoreDNS.ProtectionEnabled,
"querylog_enabled": config.CoreDNS.QueryLogEnabled,
"running": isRunning(),
"upstream_dns": config.CoreDNS.UpstreamDNS,
"version": VersionString, | https://github.com/AdguardTeam/AdGuardHome/commit/413228e6ecaf9019c8eac7034f1404b5c9c497fd | openapi.yaml |
keep keep keep add keep keep keep keep keep keep | <mask> AllowedClients []string `yaml:"allowed_clients"` // IP addresses of whitelist clients
<mask> DisallowedClients []string `yaml:"disallowed_clients"` // IP addresses of clients that should be blocked
<mask> BlockedHosts []string `yaml:"blocked_hosts"` // hosts that should be blocked
<mask>
<mask> dnsfilter.Config `yaml:",inline"`
<mask> }
<mask>
<mask> // TLSConfig is the TLS configuration for HTTPS, DNS-over-HTTPS, and DNS-over-TLS
<mask> type TLSConfig struct {
<mask> TLSListenAddr *net.TCPAddr `yaml:"-" json:"-"`
</s> + dnsforward, config: add "parental_block_host" and "safebrowsing_block_host" settings </s> add if len(s.conf.ParentalBlockHost) == 0 {
s.conf.ParentalBlockHost = parentalBlockHost
}
if len(s.conf.SafeBrowsingBlockHost) == 0 {
s.conf.SafeBrowsingBlockHost = safeBrowsingBlockHost
}
</s> remove return s.genBlockedHost(m, safeBrowsingBlockHost, d)
</s> add return s.genBlockedHost(m, s.conf.SafeBrowsingBlockHost, d) </s> remove return s.genBlockedHost(m, parentalBlockHost, d)
</s> add return s.genBlockedHost(m, s.conf.ParentalBlockHost, d) | https://github.com/AdguardTeam/AdGuardHome/commit/4134a8c30e4e3e32eab0dcc595798ffbb907e791 | dnsforward/dnsforward.go |
keep keep keep add keep keep keep keep keep | <mask> }
<mask> }
<mask> }
<mask>
<mask> s.dnsFilter = dnsfilter.New(&s.conf.Config, filters)
<mask> if s.dnsFilter == nil {
<mask> return fmt.Errorf("could not initialize dnsfilter")
<mask> }
<mask> return nil
</s> + dnsforward, config: add "parental_block_host" and "safebrowsing_block_host" settings </s> remove return s.genBlockedHost(m, safeBrowsingBlockHost, d)
</s> add return s.genBlockedHost(m, s.conf.SafeBrowsingBlockHost, d) </s> remove return s.genBlockedHost(m, parentalBlockHost, d)
</s> add return s.genBlockedHost(m, s.conf.ParentalBlockHost, d) </s> add // IP (or domain name) which is used to respond to DNS requests blocked by parental control or safe-browsing
ParentalBlockHost string `yaml:"parental_block_host"`
SafeBrowsingBlockHost string `yaml:"safebrowsing_block_host"`
| https://github.com/AdguardTeam/AdGuardHome/commit/4134a8c30e4e3e32eab0dcc595798ffbb907e791 | dnsforward/dnsforward.go |
keep keep replace keep replace keep keep | <mask> switch result.Reason {
<mask> case dnsfilter.FilteredSafeBrowsing:
<mask> return s.genBlockedHost(m, safeBrowsingBlockHost, d)
<mask> case dnsfilter.FilteredParental:
<mask> return s.genBlockedHost(m, parentalBlockHost, d)
<mask> default:
<mask> if result.IP != nil {
</s> + dnsforward, config: add "parental_block_host" and "safebrowsing_block_host" settings </s> add if len(s.conf.ParentalBlockHost) == 0 {
s.conf.ParentalBlockHost = parentalBlockHost
}
if len(s.conf.SafeBrowsingBlockHost) == 0 {
s.conf.SafeBrowsingBlockHost = safeBrowsingBlockHost
}
</s> add // IP (or domain name) which is used to respond to DNS requests blocked by parental control or safe-browsing
ParentalBlockHost string `yaml:"parental_block_host"`
SafeBrowsingBlockHost string `yaml:"safebrowsing_block_host"`
| https://github.com/AdguardTeam/AdGuardHome/commit/4134a8c30e4e3e32eab0dcc595798ffbb907e791 | dnsforward/dnsforward.go |
keep keep keep keep replace keep keep keep keep keep | <mask> _, err := os.Stat(configfile)
<mask> return errors.Is(err, os.ErrNotExist)
<mask> }
<mask>
<mask> // Connect to a remote server resolving hostname using our own DNS server
<mask> func customDialContext(ctx context.Context, network, addr string) (conn net.Conn, err error) {
<mask> log.Tracef("network:%v addr:%v", network, addr)
<mask>
<mask> host, port, err := net.SplitHostPort(addr)
<mask> if err != nil {
</s> Pull request: 2574 external tests vol.4
Merge in DNS/adguard-home from 2574-external-tests-4 to master
Close #2574.
Squashed commit of the following:
commit 0d06fce604750f76f4a319b2539105e936a248ce
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 22 13:26:25 2021 +0300
home: imp tests, docs
commit fc7b7f13f19bb8f183522a13d5726253eaae83d0
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 22 12:20:15 2021 +0300
home: fix whois test </s> remove conn, err := customDialContext(ctx, "tcp", serverAddr)
</s> add conn, err := w.dialContext(ctx, "tcp", serverAddr) </s> remove err = Context.dnsServer.Prepare(conf)
require.NoError(t, err)
</s> add // SetReadDeadline implements net.Conn interface for *fakeConn. It always
// returns nil.
func (c *fakeConn) SetReadDeadline(_ time.Time) (err error) {
return nil
}
// fakeDial is a mock implementation of customDialContext to simplify testing.
func (c *fakeConn) fakeDial(ctx context.Context, network, addr string) (conn net.Conn, err error) {
return c, nil </s> add // dialContext specifies the dial function for creating unencrypted TCP
// connections.
dialContext func(ctx context.Context, network, addr string) (conn net.Conn, err error)
</s> remove config.DNS.Port = 1234
</s> add // Write implements net.Conn interface for *fakeConn. It always returns 0 and a
// nil error without mutating the slice.
func (c *fakeConn) Write(_ []byte) (n int, err error) {
return 0, nil
} </s> remove conf := &dnsforward.ServerConfig{}
conf.UpstreamDNS = []string{"8.8.8.8"}
</s> add // Close implements net.Conn interface for *fakeConn. It always returns nil.
func (c *fakeConn) Close() (err error) {
return nil
} </s> remove var err error
Context.dnsServer, err = dnsforward.NewServer(dnsforward.DNSCreateParams{})
require.NoError(t, err)
</s> add // Read implements net.Conn interface for *fakeConn. It puts the content of
// c.data field into b up to the b's capacity.
func (c *fakeConn) Read(b []byte) (n int, err error) {
return copy(b, c.data), io.EOF
} | https://github.com/AdguardTeam/AdGuardHome/commit/4165e0ef3a751383f1dd28b13a4086e3c1eb8cba | internal/home/home.go |
keep add keep keep keep keep keep keep | <mask> ipChan chan net.IP
<mask>
<mask> // Contains IP addresses of clients
<mask> // An active IP address is resolved once again after it expires.
<mask> // If IP address couldn't be resolved, it stays here for some time to prevent further attempts to resolve the same IP.
<mask> ipAddrs cache.Cache
<mask>
<mask> // TODO(a.garipov): Rewrite to use time.Duration. Like, seriously, why?
</s> Pull request: 2574 external tests vol.4
Merge in DNS/adguard-home from 2574-external-tests-4 to master
Close #2574.
Squashed commit of the following:
commit 0d06fce604750f76f4a319b2539105e936a248ce
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 22 13:26:25 2021 +0300
home: imp tests, docs
commit fc7b7f13f19bb8f183522a13d5726253eaae83d0
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 22 12:20:15 2021 +0300
home: fix whois test </s> remove func prepareTestDNSServer(t *testing.T) {
t.Helper()
</s> add // fakeConn is a mock implementation of net.Conn to simplify testing.
//
// TODO(e.burkov): Search for other places in code where it may be used. Move
// into aghtest then.
type fakeConn struct {
// Conn is embedded here simply to make *fakeConn a net.Conn without
// actually implementing all methods.
net.Conn
data []byte
} </s> remove // TODO(e.burkov): It's kind of complicated to get rid of network access in this
// test. The thing is that *Whois creates new *net.Dialer each time it requests
// the server, so it becomes hard to simulate handling of request from test even
// with substituted upstream. However, it must be done.
</s> add </s> remove err = Context.dnsServer.Prepare(conf)
require.NoError(t, err)
</s> add // SetReadDeadline implements net.Conn interface for *fakeConn. It always
// returns nil.
func (c *fakeConn) SetReadDeadline(_ time.Time) (err error) {
return nil
}
// fakeDial is a mock implementation of customDialContext to simplify testing.
func (c *fakeConn) fakeDial(ctx context.Context, network, addr string) (conn net.Conn, err error) {
return c, nil </s> remove prepareTestDNSServer(t)
</s> add const (
nl = "\n"
data = `OrgName: FakeOrg LLC` + nl +
`City: Nonreal` + nl +
`Country: Imagiland` + nl
)
fc := &fakeConn{
data: []byte(data),
} </s> remove var err error
Context.dnsServer, err = dnsforward.NewServer(dnsforward.DNSCreateParams{})
require.NoError(t, err)
</s> add // Read implements net.Conn interface for *fakeConn. It puts the content of
// c.data field into b up to the b's capacity.
func (c *fakeConn) Read(b []byte) (n int, err error) {
return copy(b, c.data), io.EOF
} </s> remove // Connect to a remote server resolving hostname using our own DNS server
</s> add // Connect to a remote server resolving hostname using our own DNS server.
//
// TODO(e.burkov): This messy logic should be decomposed and clarified. | https://github.com/AdguardTeam/AdGuardHome/commit/4165e0ef3a751383f1dd28b13a4086e3c1eb8cba | internal/home/whois.go |
keep keep keep keep replace keep keep keep keep keep | <mask> ipAddrs: cache.New(cache.Config{
<mask> EnableLRU: true,
<mask> MaxCount: 10000,
<mask> }),
<mask> ipChan: make(chan net.IP, 255),
<mask> }
<mask>
<mask> go w.workerLoop()
<mask>
<mask> return &w
</s> Pull request: 2574 external tests vol.4
Merge in DNS/adguard-home from 2574-external-tests-4 to master
Close #2574.
Squashed commit of the following:
commit 0d06fce604750f76f4a319b2539105e936a248ce
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 22 13:26:25 2021 +0300
home: imp tests, docs
commit fc7b7f13f19bb8f183522a13d5726253eaae83d0
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 22 12:20:15 2021 +0300
home: fix whois test </s> remove conn, err := customDialContext(ctx, "tcp", serverAddr)
</s> add conn, err := w.dialContext(ctx, "tcp", serverAddr) </s> remove conf := &dnsforward.ServerConfig{}
conf.UpstreamDNS = []string{"8.8.8.8"}
</s> add // Close implements net.Conn interface for *fakeConn. It always returns nil.
func (c *fakeConn) Close() (err error) {
return nil
} </s> remove err = Context.dnsServer.Prepare(conf)
require.NoError(t, err)
</s> add // SetReadDeadline implements net.Conn interface for *fakeConn. It always
// returns nil.
func (c *fakeConn) SetReadDeadline(_ time.Time) (err error) {
return nil
}
// fakeDial is a mock implementation of customDialContext to simplify testing.
func (c *fakeConn) fakeDial(ctx context.Context, network, addr string) (conn net.Conn, err error) {
return c, nil </s> remove config.DNS.Port = 1234
</s> add // Write implements net.Conn interface for *fakeConn. It always returns 0 and a
// nil error without mutating the slice.
func (c *fakeConn) Write(_ []byte) (n int, err error) {
return 0, nil
} </s> remove var err error
Context.dnsServer, err = dnsforward.NewServer(dnsforward.DNSCreateParams{})
require.NoError(t, err)
</s> add // Read implements net.Conn interface for *fakeConn. It puts the content of
// c.data field into b up to the b's capacity.
func (c *fakeConn) Read(b []byte) (n int, err error) {
return copy(b, c.data), io.EOF
} </s> remove // Connect to a remote server resolving hostname using our own DNS server
</s> add // Connect to a remote server resolving hostname using our own DNS server.
//
// TODO(e.burkov): This messy logic should be decomposed and clarified. | https://github.com/AdguardTeam/AdGuardHome/commit/4165e0ef3a751383f1dd28b13a4086e3c1eb8cba | internal/home/whois.go |
keep keep keep keep replace keep keep keep keep keep | <mask> addr, _, _ := net.SplitHostPort(serverAddr)
<mask> if addr == "whois.arin.net" {
<mask> target = "n + " + target
<mask> }
<mask> conn, err := customDialContext(ctx, "tcp", serverAddr)
<mask> if err != nil {
<mask> return "", err
<mask> }
<mask> defer conn.Close()
<mask>
</s> Pull request: 2574 external tests vol.4
Merge in DNS/adguard-home from 2574-external-tests-4 to master
Close #2574.
Squashed commit of the following:
commit 0d06fce604750f76f4a319b2539105e936a248ce
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 22 13:26:25 2021 +0300
home: imp tests, docs
commit fc7b7f13f19bb8f183522a13d5726253eaae83d0
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 22 12:20:15 2021 +0300
home: fix whois test </s> remove // Connect to a remote server resolving hostname using our own DNS server
</s> add // Connect to a remote server resolving hostname using our own DNS server.
//
// TODO(e.burkov): This messy logic should be decomposed and clarified. </s> remove prepareTestDNSServer(t)
</s> add const (
nl = "\n"
data = `OrgName: FakeOrg LLC` + nl +
`City: Nonreal` + nl +
`Country: Imagiland` + nl
)
fc := &fakeConn{
data: []byte(data),
} </s> remove conf := &dnsforward.ServerConfig{}
conf.UpstreamDNS = []string{"8.8.8.8"}
</s> add // Close implements net.Conn interface for *fakeConn. It always returns nil.
func (c *fakeConn) Close() (err error) {
return nil
} </s> remove w := Whois{timeoutMsec: 5000}
resp, err := w.queryAll(context.Background(), "8.8.8.8")
</s> add w := Whois{
timeoutMsec: 5000,
dialContext: fc.fakeDial,
}
resp, err := w.queryAll(context.Background(), "1.2.3.4") </s> remove config.DNS.Port = 1234
</s> add // Write implements net.Conn interface for *fakeConn. It always returns 0 and a
// nil error without mutating the slice.
func (c *fakeConn) Write(_ []byte) (n int, err error) {
return 0, nil
} </s> remove err = Context.dnsServer.Prepare(conf)
require.NoError(t, err)
</s> add // SetReadDeadline implements net.Conn interface for *fakeConn. It always
// returns nil.
func (c *fakeConn) SetReadDeadline(_ time.Time) (err error) {
return nil
}
// fakeDial is a mock implementation of customDialContext to simplify testing.
func (c *fakeConn) fakeDial(ctx context.Context, network, addr string) (conn net.Conn, err error) {
return c, nil | https://github.com/AdguardTeam/AdGuardHome/commit/4165e0ef3a751383f1dd28b13a4086e3c1eb8cba | internal/home/whois.go |
keep add keep keep keep keep keep | <mask> import (
<mask> "context"
<mask> "testing"
<mask> "time"
<mask>
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
</s> Pull request: 2574 external tests vol.4
Merge in DNS/adguard-home from 2574-external-tests-4 to master
Close #2574.
Squashed commit of the following:
commit 0d06fce604750f76f4a319b2539105e936a248ce
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 22 13:26:25 2021 +0300
home: imp tests, docs
commit fc7b7f13f19bb8f183522a13d5726253eaae83d0
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 22 12:20:15 2021 +0300
home: fix whois test </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
</s> add </s> add "time" </s> remove func prepareTestDNSServer(t *testing.T) {
t.Helper()
</s> add // fakeConn is a mock implementation of net.Conn to simplify testing.
//
// TODO(e.burkov): Search for other places in code where it may be used. Move
// into aghtest then.
type fakeConn struct {
// Conn is embedded here simply to make *fakeConn a net.Conn without
// actually implementing all methods.
net.Conn
data []byte
} </s> remove prepareTestDNSServer(t)
</s> add const (
nl = "\n"
data = `OrgName: FakeOrg LLC` + nl +
`City: Nonreal` + nl +
`Country: Imagiland` + nl
)
fc := &fakeConn{
data: []byte(data),
} </s> remove assert.Equal(t, "Google LLC", m["orgname"])
assert.Equal(t, "US", m["country"])
assert.Equal(t, "Mountain View", m["city"])
</s> add assert.Equal(t, "FakeOrg LLC", m["orgname"])
assert.Equal(t, "Imagiland", m["country"])
assert.Equal(t, "Nonreal", m["city"]) </s> remove w := Whois{timeoutMsec: 5000}
resp, err := w.queryAll(context.Background(), "8.8.8.8")
</s> add w := Whois{
timeoutMsec: 5000,
dialContext: fc.fakeDial,
}
resp, err := w.queryAll(context.Background(), "1.2.3.4") | https://github.com/AdguardTeam/AdGuardHome/commit/4165e0ef3a751383f1dd28b13a4086e3c1eb8cba | internal/home/whois_test.go |
keep keep add keep keep keep keep | <mask> "io"
<mask> "net"
<mask> "testing"
<mask>
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
</s> Pull request: 2574 external tests vol.4
Merge in DNS/adguard-home from 2574-external-tests-4 to master
Close #2574.
Squashed commit of the following:
commit 0d06fce604750f76f4a319b2539105e936a248ce
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 22 13:26:25 2021 +0300
home: imp tests, docs
commit fc7b7f13f19bb8f183522a13d5726253eaae83d0
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 22 12:20:15 2021 +0300
home: fix whois test </s> add "io"
"net" </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
</s> add </s> remove func prepareTestDNSServer(t *testing.T) {
t.Helper()
</s> add // fakeConn is a mock implementation of net.Conn to simplify testing.
//
// TODO(e.burkov): Search for other places in code where it may be used. Move
// into aghtest then.
type fakeConn struct {
// Conn is embedded here simply to make *fakeConn a net.Conn without
// actually implementing all methods.
net.Conn
data []byte
} </s> remove prepareTestDNSServer(t)
</s> add const (
nl = "\n"
data = `OrgName: FakeOrg LLC` + nl +
`City: Nonreal` + nl +
`Country: Imagiland` + nl
)
fc := &fakeConn{
data: []byte(data),
} </s> remove assert.Equal(t, "Google LLC", m["orgname"])
assert.Equal(t, "US", m["country"])
assert.Equal(t, "Mountain View", m["city"])
</s> add assert.Equal(t, "FakeOrg LLC", m["orgname"])
assert.Equal(t, "Imagiland", m["country"])
assert.Equal(t, "Nonreal", m["city"]) </s> remove w := Whois{timeoutMsec: 5000}
resp, err := w.queryAll(context.Background(), "8.8.8.8")
</s> add w := Whois{
timeoutMsec: 5000,
dialContext: fc.fakeDial,
}
resp, err := w.queryAll(context.Background(), "1.2.3.4") | https://github.com/AdguardTeam/AdGuardHome/commit/4165e0ef3a751383f1dd28b13a4086e3c1eb8cba | internal/home/whois_test.go |
keep keep replace keep keep keep keep replace replace keep keep | <mask> "testing"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> func prepareTestDNSServer(t *testing.T) {
<mask> t.Helper()
<mask>
<mask> config.DNS.Port = 1234
</s> Pull request: 2574 external tests vol.4
Merge in DNS/adguard-home from 2574-external-tests-4 to master
Close #2574.
Squashed commit of the following:
commit 0d06fce604750f76f4a319b2539105e936a248ce
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 22 13:26:25 2021 +0300
home: imp tests, docs
commit fc7b7f13f19bb8f183522a13d5726253eaae83d0
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 22 12:20:15 2021 +0300
home: fix whois test </s> add "time" </s> remove config.DNS.Port = 1234
</s> add // Write implements net.Conn interface for *fakeConn. It always returns 0 and a
// nil error without mutating the slice.
func (c *fakeConn) Write(_ []byte) (n int, err error) {
return 0, nil
} </s> add "io"
"net" </s> remove var err error
Context.dnsServer, err = dnsforward.NewServer(dnsforward.DNSCreateParams{})
require.NoError(t, err)
</s> add // Read implements net.Conn interface for *fakeConn. It puts the content of
// c.data field into b up to the b's capacity.
func (c *fakeConn) Read(b []byte) (n int, err error) {
return copy(b, c.data), io.EOF
} </s> remove prepareTestDNSServer(t)
</s> add const (
nl = "\n"
data = `OrgName: FakeOrg LLC` + nl +
`City: Nonreal` + nl +
`Country: Imagiland` + nl
)
fc := &fakeConn{
data: []byte(data),
} | https://github.com/AdguardTeam/AdGuardHome/commit/4165e0ef3a751383f1dd28b13a4086e3c1eb8cba | internal/home/whois_test.go |
keep keep keep replace keep replace replace replace | <mask> func prepareTestDNSServer(t *testing.T) {
<mask> t.Helper()
<mask>
<mask> config.DNS.Port = 1234
<mask>
<mask> var err error
<mask> Context.dnsServer, err = dnsforward.NewServer(dnsforward.DNSCreateParams{})
<mask> require.NoError(t, err)
</s> Pull request: 2574 external tests vol.4
Merge in DNS/adguard-home from 2574-external-tests-4 to master
Close #2574.
Squashed commit of the following:
commit 0d06fce604750f76f4a319b2539105e936a248ce
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 22 13:26:25 2021 +0300
home: imp tests, docs
commit fc7b7f13f19bb8f183522a13d5726253eaae83d0
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 22 12:20:15 2021 +0300
home: fix whois test </s> remove func prepareTestDNSServer(t *testing.T) {
t.Helper()
</s> add // fakeConn is a mock implementation of net.Conn to simplify testing.
//
// TODO(e.burkov): Search for other places in code where it may be used. Move
// into aghtest then.
type fakeConn struct {
// Conn is embedded here simply to make *fakeConn a net.Conn without
// actually implementing all methods.
net.Conn
data []byte
} </s> remove conf := &dnsforward.ServerConfig{}
conf.UpstreamDNS = []string{"8.8.8.8"}
</s> add // Close implements net.Conn interface for *fakeConn. It always returns nil.
func (c *fakeConn) Close() (err error) {
return nil
} </s> remove "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
</s> add </s> remove w := Whois{timeoutMsec: 5000}
resp, err := w.queryAll(context.Background(), "8.8.8.8")
</s> add w := Whois{
timeoutMsec: 5000,
dialContext: fc.fakeDial,
}
resp, err := w.queryAll(context.Background(), "1.2.3.4") </s> remove // TODO(e.burkov): It's kind of complicated to get rid of network access in this
// test. The thing is that *Whois creates new *net.Dialer each time it requests
// the server, so it becomes hard to simulate handling of request from test even
// with substituted upstream. However, it must be done.
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/4165e0ef3a751383f1dd28b13a4086e3c1eb8cba | internal/home/whois_test.go |
keep keep keep replace replace keep keep keep keep keep keep keep keep replace replace | <mask> Context.dnsServer, err = dnsforward.NewServer(dnsforward.DNSCreateParams{})
<mask> require.NoError(t, err)
<mask>
<mask> conf := &dnsforward.ServerConfig{}
<mask> conf.UpstreamDNS = []string{"8.8.8.8"}
<mask>
<mask> err = Context.dnsServer.Prepare(conf)
<mask> require.NoError(t, err)
<mask> }
<mask>
<mask> conf := &dnsforward.ServerConfig{}
<mask> conf.UpstreamDNS = []string{"8.8.8.8"}
<mask>
<mask> err = Context.dnsServer.Prepare(conf)
<mask> require.NoError(t, err)
</s> Pull request: 2574 external tests vol.4
Merge in DNS/adguard-home from 2574-external-tests-4 to master
Close #2574.
Squashed commit of the following:
commit 0d06fce604750f76f4a319b2539105e936a248ce
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 22 13:26:25 2021 +0300
home: imp tests, docs
commit fc7b7f13f19bb8f183522a13d5726253eaae83d0
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 22 12:20:15 2021 +0300
home: fix whois test </s> remove var err error
Context.dnsServer, err = dnsforward.NewServer(dnsforward.DNSCreateParams{})
require.NoError(t, err)
</s> add // Read implements net.Conn interface for *fakeConn. It puts the content of
// c.data field into b up to the b's capacity.
func (c *fakeConn) Read(b []byte) (n int, err error) {
return copy(b, c.data), io.EOF
} </s> remove config.DNS.Port = 1234
</s> add // Write implements net.Conn interface for *fakeConn. It always returns 0 and a
// nil error without mutating the slice.
func (c *fakeConn) Write(_ []byte) (n int, err error) {
return 0, nil
} </s> remove // TODO(e.burkov): It's kind of complicated to get rid of network access in this
// test. The thing is that *Whois creates new *net.Dialer each time it requests
// the server, so it becomes hard to simulate handling of request from test even
// with substituted upstream. However, it must be done.
</s> add </s> remove w := Whois{timeoutMsec: 5000}
resp, err := w.queryAll(context.Background(), "8.8.8.8")
</s> add w := Whois{
timeoutMsec: 5000,
dialContext: fc.fakeDial,
}
resp, err := w.queryAll(context.Background(), "1.2.3.4") </s> remove conn, err := customDialContext(ctx, "tcp", serverAddr)
</s> add conn, err := w.dialContext(ctx, "tcp", serverAddr) | https://github.com/AdguardTeam/AdGuardHome/commit/4165e0ef3a751383f1dd28b13a4086e3c1eb8cba | internal/home/whois_test.go |
keep keep keep replace replace replace replace keep replace keep keep keep keep | <mask> require.NoError(t, err)
<mask> }
<mask>
<mask> // TODO(e.burkov): It's kind of complicated to get rid of network access in this
<mask> // test. The thing is that *Whois creates new *net.Dialer each time it requests
<mask> // the server, so it becomes hard to simulate handling of request from test even
<mask> // with substituted upstream. However, it must be done.
<mask> func TestWhois(t *testing.T) {
<mask> prepareTestDNSServer(t)
<mask>
<mask> w := Whois{timeoutMsec: 5000}
<mask> resp, err := w.queryAll(context.Background(), "8.8.8.8")
<mask> assert.NoError(t, err)
</s> Pull request: 2574 external tests vol.4
Merge in DNS/adguard-home from 2574-external-tests-4 to master
Close #2574.
Squashed commit of the following:
commit 0d06fce604750f76f4a319b2539105e936a248ce
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 22 13:26:25 2021 +0300
home: imp tests, docs
commit fc7b7f13f19bb8f183522a13d5726253eaae83d0
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 22 12:20:15 2021 +0300
home: fix whois test </s> remove err = Context.dnsServer.Prepare(conf)
require.NoError(t, err)
</s> add // SetReadDeadline implements net.Conn interface for *fakeConn. It always
// returns nil.
func (c *fakeConn) SetReadDeadline(_ time.Time) (err error) {
return nil
}
// fakeDial is a mock implementation of customDialContext to simplify testing.
func (c *fakeConn) fakeDial(ctx context.Context, network, addr string) (conn net.Conn, err error) {
return c, nil </s> remove w := Whois{timeoutMsec: 5000}
resp, err := w.queryAll(context.Background(), "8.8.8.8")
</s> add w := Whois{
timeoutMsec: 5000,
dialContext: fc.fakeDial,
}
resp, err := w.queryAll(context.Background(), "1.2.3.4") </s> remove func prepareTestDNSServer(t *testing.T) {
t.Helper()
</s> add // fakeConn is a mock implementation of net.Conn to simplify testing.
//
// TODO(e.burkov): Search for other places in code where it may be used. Move
// into aghtest then.
type fakeConn struct {
// Conn is embedded here simply to make *fakeConn a net.Conn without
// actually implementing all methods.
net.Conn
data []byte
} </s> add // dialContext specifies the dial function for creating unencrypted TCP
// connections.
dialContext func(ctx context.Context, network, addr string) (conn net.Conn, err error)
</s> remove var err error
Context.dnsServer, err = dnsforward.NewServer(dnsforward.DNSCreateParams{})
require.NoError(t, err)
</s> add // Read implements net.Conn interface for *fakeConn. It puts the content of
// c.data field into b up to the b's capacity.
func (c *fakeConn) Read(b []byte) (n int, err error) {
return copy(b, c.data), io.EOF
} | https://github.com/AdguardTeam/AdGuardHome/commit/4165e0ef3a751383f1dd28b13a4086e3c1eb8cba | internal/home/whois_test.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> // with substituted upstream. However, it must be done.
<mask> func TestWhois(t *testing.T) {
<mask> prepareTestDNSServer(t)
<mask>
<mask> w := Whois{timeoutMsec: 5000}
<mask> resp, err := w.queryAll(context.Background(), "8.8.8.8")
<mask> assert.NoError(t, err)
<mask>
<mask> m := whoisParse(resp)
<mask> require.NotEmpty(t, m)
<mask>
</s> Pull request: 2574 external tests vol.4
Merge in DNS/adguard-home from 2574-external-tests-4 to master
Close #2574.
Squashed commit of the following:
commit 0d06fce604750f76f4a319b2539105e936a248ce
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 22 13:26:25 2021 +0300
home: imp tests, docs
commit fc7b7f13f19bb8f183522a13d5726253eaae83d0
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 22 12:20:15 2021 +0300
home: fix whois test </s> remove // TODO(e.burkov): It's kind of complicated to get rid of network access in this
// test. The thing is that *Whois creates new *net.Dialer each time it requests
// the server, so it becomes hard to simulate handling of request from test even
// with substituted upstream. However, it must be done.
</s> add </s> remove prepareTestDNSServer(t)
</s> add const (
nl = "\n"
data = `OrgName: FakeOrg LLC` + nl +
`City: Nonreal` + nl +
`Country: Imagiland` + nl
)
fc := &fakeConn{
data: []byte(data),
} </s> remove assert.Equal(t, "Google LLC", m["orgname"])
assert.Equal(t, "US", m["country"])
assert.Equal(t, "Mountain View", m["city"])
</s> add assert.Equal(t, "FakeOrg LLC", m["orgname"])
assert.Equal(t, "Imagiland", m["country"])
assert.Equal(t, "Nonreal", m["city"]) </s> remove // Connect to a remote server resolving hostname using our own DNS server
</s> add // Connect to a remote server resolving hostname using our own DNS server.
//
// TODO(e.burkov): This messy logic should be decomposed and clarified. </s> remove conf := &dnsforward.ServerConfig{}
conf.UpstreamDNS = []string{"8.8.8.8"}
</s> add // Close implements net.Conn interface for *fakeConn. It always returns nil.
func (c *fakeConn) Close() (err error) {
return nil
} </s> remove conn, err := customDialContext(ctx, "tcp", serverAddr)
</s> add conn, err := w.dialContext(ctx, "tcp", serverAddr) | https://github.com/AdguardTeam/AdGuardHome/commit/4165e0ef3a751383f1dd28b13a4086e3c1eb8cba | internal/home/whois_test.go |
keep keep keep keep replace replace replace keep | <mask>
<mask> m := whoisParse(resp)
<mask> require.NotEmpty(t, m)
<mask>
<mask> assert.Equal(t, "Google LLC", m["orgname"])
<mask> assert.Equal(t, "US", m["country"])
<mask> assert.Equal(t, "Mountain View", m["city"])
<mask> }
</s> Pull request: 2574 external tests vol.4
Merge in DNS/adguard-home from 2574-external-tests-4 to master
Close #2574.
Squashed commit of the following:
commit 0d06fce604750f76f4a319b2539105e936a248ce
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 22 13:26:25 2021 +0300
home: imp tests, docs
commit fc7b7f13f19bb8f183522a13d5726253eaae83d0
Author: Eugene Burkov <[email protected]>
Date: Thu Apr 22 12:20:15 2021 +0300
home: fix whois test </s> remove w := Whois{timeoutMsec: 5000}
resp, err := w.queryAll(context.Background(), "8.8.8.8")
</s> add w := Whois{
timeoutMsec: 5000,
dialContext: fc.fakeDial,
}
resp, err := w.queryAll(context.Background(), "1.2.3.4") </s> remove conn, err := customDialContext(ctx, "tcp", serverAddr)
</s> add conn, err := w.dialContext(ctx, "tcp", serverAddr) </s> remove conf := &dnsforward.ServerConfig{}
conf.UpstreamDNS = []string{"8.8.8.8"}
</s> add // Close implements net.Conn interface for *fakeConn. It always returns nil.
func (c *fakeConn) Close() (err error) {
return nil
} </s> remove prepareTestDNSServer(t)
</s> add const (
nl = "\n"
data = `OrgName: FakeOrg LLC` + nl +
`City: Nonreal` + nl +
`Country: Imagiland` + nl
)
fc := &fakeConn{
data: []byte(data),
} </s> remove // Connect to a remote server resolving hostname using our own DNS server
</s> add // Connect to a remote server resolving hostname using our own DNS server.
//
// TODO(e.burkov): This messy logic should be decomposed and clarified. </s> remove // TODO(e.burkov): It's kind of complicated to get rid of network access in this
// test. The thing is that *Whois creates new *net.Dialer each time it requests
// the server, so it becomes hard to simulate handling of request from test even
// with substituted upstream. However, it must be done.
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/4165e0ef3a751383f1dd28b13a4086e3c1eb8cba | internal/home/whois_test.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.