docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
"github.com/AdguardTeam/AdGuardHome/util" | <mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> "github.com/AdguardTeam/golibs/file"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
</s> +(dhcpd): added static IP for MacOS | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/filter.go |
line := util.SplitNext(&data, '\n') | <mask> seenTitle := false
<mask>
<mask> // Count lines in the filter
<mask> for len(data) != 0 {
<mask> line := SplitNext(&data, '\n')
<mask> if len(line) == 0 {
<mask> continue
<mask> }
<mask>
<mask> if line[0] == '!' {
</s> +(dhcpd): added static IP for MacOS </s> remove ln := SplitNext(&data, '\n')
</s> add ln := util.SplitNext(&data, '\n') </s> remove setRlimit(config.RlimitNoFile)
</s> add util.SetRlimit(config.RlimitNoFile) </s> remove // GetValidNetInterfaces returns interfaces that are eligible for DNS and/or DHCP
// invalid interface is a ppp interface or the one that doesn't allow broadcasts
func GetValidNetInterfaces() ([]net.Interface, error) {
ifaces, err := net.Interfaces()
if err != nil {
return nil, fmt.Errorf("Couldn't get list of interfaces: %s", err)
}
netIfaces := []net.Interface{}
for i := range ifaces {
if ifaces[i].Flags&net.FlagPointToPoint != 0 {
// this interface is ppp, we're not interested in this one
continue
}
iface := ifaces[i]
netIfaces = append(netIfaces, iface)
}
return netIfaces, nil
}
</s> add </s> remove // Get IP address with netmask
func GetFullIP(ifaceName string) string {
cmd := exec.Command("ip", "-oneline", "-family", "inet", "address", "show", ifaceName)
log.Tracef("executing %s %v", cmd.Path, cmd.Args)
d, err := cmd.Output()
if err != nil || cmd.ProcessState.ExitCode() != 0 {
return ""
}
fields := strings.Fields(string(d))
if len(fields) < 4 {
return ""
}
_, _, err = net.ParseCIDR(fields[3])
if err != nil {
return ""
}
return fields[3]
}
// Set a static IP for network interface
// Supports: Raspbian.
</s> add // Set a static IP for the specified network interface </s> remove ip := GetFullIP(ifaceName)
if len(ip) == 0 {
return errors.New("Can't get IP address")
}
ip4, _, err := net.ParseCIDR(ip)
if err != nil {
return err
}
gatewayIP := getGatewayIP(ifaceName)
add := setStaticIPDhcpcdConf(ifaceName, ip, gatewayIP, ip4.String())
body, err := ioutil.ReadFile("/etc/dhcpcd.conf")
if err != nil {
return err
</s> add if runtime.GOOS == "linux" {
return setStaticIPDhcpdConf(ifaceName) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/filter.go |
dir := prepareTestDir()
defer func() { _ = os.RemoveAll(dir) }()
Context = homeContext{}
Context.workDir = dir | <mask> "github.com/stretchr/testify/assert"
<mask> )
<mask>
<mask> func TestFilters(t *testing.T) {
<mask> Context.client = &http.Client{
<mask> Timeout: time.Minute * 5,
<mask> }
<mask>
<mask> f := filter{
<mask> URL: "https://adguardteam.github.io/AdGuardSDNSFilter/Filters/filter.txt",
</s> +(dhcpd): added static IP for MacOS </s> remove Context.httpsServer.server.Shutdown(context.TODO())
</s> add _ = Context.httpsServer.server.Shutdown(context.TODO()) </s> remove respData.StaticIP.IP = dhcpd.GetFullIP(interfaceName)
</s> add respData.StaticIP.IP = util.GetSubnet(interfaceName) </s> remove Context.httpServer.Shutdown(context.TODO())
</s> add _ = Context.httpServer.Shutdown(context.TODO()) </s> remove err = checkPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = util.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err = checkPortAvailable(reqData.Web.IP, reqData.Web.Port)
</s> add err = util.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/filter_test.go |
_ = os.Remove(f.Path()) | <mask> err = f.load()
<mask> assert.True(t, err == nil)
<mask>
<mask> f.unload()
<mask> os.Remove(f.Path())
<mask> }
</s> +(dhcpd): added static IP for MacOS </s> remove err = checkPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = util.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove body = append(body, []byte(add)...)
err = file.SafeWrite("/etc/dhcpcd.conf", body)
if err != nil {
return err
</s> add if runtime.GOOS == "darwin" {
return fmt.Errorf("cannot do that")
// return setStaticIPDarwin(ifaceName) </s> remove err = checkPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = util.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err = checkPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port)
</s> add err = util.CheckPacketPortAvailable(newSettings.DNS.IP, newSettings.DNS.Port) </s> remove ip := GetFullIP(ifaceName)
if len(ip) == 0 {
return errors.New("Can't get IP address")
}
ip4, _, err := net.ParseCIDR(ip)
if err != nil {
return err
}
gatewayIP := getGatewayIP(ifaceName)
add := setStaticIPDhcpcdConf(ifaceName, ip, gatewayIP, ip4.String())
body, err := ioutil.ReadFile("/etc/dhcpcd.conf")
if err != nil {
return err
</s> add if runtime.GOOS == "linux" {
return setStaticIPDhcpdConf(ifaceName) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/filter_test.go |
"github.com/AdguardTeam/AdGuardHome/util"
"github.com/joomcode/errorx"
| <mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/isdelve"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dhcpd"
<mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/querylog"
</s> +(dhcpd): added static IP for MacOS | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/home.go |
util.SetRlimit(config.RlimitNoFile) | <mask> config.Clients = nil
<mask>
<mask> if (runtime.GOOS == "linux" || runtime.GOOS == "darwin") &&
<mask> config.RlimitNoFile != 0 {
<mask> setRlimit(config.RlimitNoFile)
<mask> }
<mask>
<mask> // override bind host/port from the console
<mask> if args.bindHost != "" {
<mask> config.BindHost = args.bindHost
</s> +(dhcpd): added static IP for MacOS </s> remove ln := SplitNext(&data, '\n')
</s> add ln := util.SplitNext(&data, '\n') </s> remove ip := GetFullIP(ifaceName)
if len(ip) == 0 {
return errors.New("Can't get IP address")
}
ip4, _, err := net.ParseCIDR(ip)
if err != nil {
return err
}
gatewayIP := getGatewayIP(ifaceName)
add := setStaticIPDhcpcdConf(ifaceName, ip, gatewayIP, ip4.String())
body, err := ioutil.ReadFile("/etc/dhcpcd.conf")
if err != nil {
return err
</s> add if runtime.GOOS == "linux" {
return setStaticIPDhcpdConf(ifaceName) </s> remove err = checkPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = util.CheckPacketPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove // Get IP address with netmask
func GetFullIP(ifaceName string) string {
cmd := exec.Command("ip", "-oneline", "-family", "inet", "address", "show", ifaceName)
log.Tracef("executing %s %v", cmd.Path, cmd.Args)
d, err := cmd.Output()
if err != nil || cmd.ProcessState.ExitCode() != 0 {
return ""
}
fields := strings.Fields(string(d))
if len(fields) < 4 {
return ""
}
_, _, err = net.ParseCIDR(fields[3])
if err != nil {
return ""
}
return fields[3]
}
// Set a static IP for network interface
// Supports: Raspbian.
</s> add // Set a static IP for the specified network interface </s> remove body = append(body, []byte(add)...)
err = file.SafeWrite("/etc/dhcpcd.conf", body)
if err != nil {
return err
</s> add if runtime.GOOS == "darwin" {
return fmt.Errorf("cannot do that")
// return setStaticIPDarwin(ifaceName) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/home.go |
admin, _ := util.HaveAdminRights() | <mask>
<mask> // Check if the current user has root (administrator) rights
<mask> // and if not, ask and try to run as root
<mask> func requireAdminRights() {
<mask> admin, _ := haveAdminRights()
<mask> if //noinspection ALL
<mask> admin || isdelve.Enabled {
<mask> return
<mask> }
<mask>
</s> +(dhcpd): added static IP for MacOS </s> remove err = checkPortAvailable(newSettings.Web.IP, newSettings.Web.Port)
</s> add err = util.CheckPortAvailable(newSettings.Web.IP, newSettings.Web.Port) </s> remove err := configureSyslog()
</s> add err := util.ConfigureSyslog(serviceName) </s> remove // GetValidNetInterfaces returns interfaces that are eligible for DNS and/or DHCP
// invalid interface is a ppp interface or the one that doesn't allow broadcasts
func GetValidNetInterfaces() ([]net.Interface, error) {
ifaces, err := net.Interfaces()
if err != nil {
return nil, fmt.Errorf("Couldn't get list of interfaces: %s", err)
}
netIfaces := []net.Interface{}
for i := range ifaces {
if ifaces[i].Flags&net.FlagPointToPoint != 0 {
// this interface is ppp, we're not interested in this one
continue
}
iface := ifaces[i]
netIfaces = append(netIfaces, iface)
}
return netIfaces, nil
}
</s> add </s> remove setRlimit(config.RlimitNoFile)
</s> add util.SetRlimit(config.RlimitNoFile) </s> remove ifaces, err := getValidNetInterfacesForWeb()
</s> add ifaces, err := util.GetValidNetInterfacesForWeb() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/home.go |
err := util.ConfigureSyslog(serviceName) | <mask> }
<mask>
<mask> if ls.LogFile == configSyslog {
<mask> // Use syslog where it is possible and eventlog on Windows
<mask> err := configureSyslog()
<mask> if err != nil {
<mask> log.Fatalf("cannot initialize syslog: %s", err)
<mask> }
<mask> } else {
<mask> logFilePath := filepath.Join(Context.workDir, ls.LogFile)
</s> +(dhcpd): added static IP for MacOS </s> remove ifaces, err := getValidNetInterfacesForWeb()
</s> add ifaces, err := util.GetValidNetInterfacesForWeb() </s> remove err = checkPortAvailable(newSettings.Web.IP, newSettings.Web.Port)
</s> add err = util.CheckPortAvailable(newSettings.Web.IP, newSettings.Web.Port) </s> remove
interfaceName := getInterfaceByIP(reqData.DNS.IP)
</s> add interfaceName := util.GetInterfaceByIP(reqData.DNS.IP) </s> remove err = checkPortAvailable(config.BindHost, data.PortHTTPS)
</s> add err = util.CheckPortAvailable(config.BindHost, data.PortHTTPS) </s> remove err = checkPortAvailable(config.BindHost, data.PortHTTPS)
</s> add err = util.CheckPortAvailable(config.BindHost, data.PortHTTPS) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/home.go |
_ = Context.httpsServer.server.Shutdown(context.TODO()) | <mask> func stopHTTPServer() {
<mask> log.Info("Stopping HTTP server...")
<mask> Context.httpsServer.shutdown = true
<mask> if Context.httpsServer.server != nil {
<mask> Context.httpsServer.server.Shutdown(context.TODO())
<mask> }
<mask> Context.httpServer.Shutdown(context.TODO())
<mask> log.Info("Stopped HTTP server")
<mask> }
<mask>
</s> +(dhcpd): added static IP for MacOS </s> remove Context.httpServer.Shutdown(context.TODO())
</s> add _ = Context.httpServer.Shutdown(context.TODO()) </s> remove err = checkPortAvailable(config.BindHost, data.PortHTTPS)
</s> add err = util.CheckPortAvailable(config.BindHost, data.PortHTTPS) </s> remove err = checkPortAvailable(config.BindHost, data.PortHTTPS)
</s> add err = util.CheckPortAvailable(config.BindHost, data.PortHTTPS) </s> remove err = checkPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = util.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port) </s> remove err = checkPortAvailable(reqData.Web.IP, reqData.Web.Port)
</s> add err = util.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/home.go |
_ = Context.httpServer.Shutdown(context.TODO()) | <mask> Context.httpsServer.shutdown = true
<mask> if Context.httpsServer.server != nil {
<mask> Context.httpsServer.server.Shutdown(context.TODO())
<mask> }
<mask> Context.httpServer.Shutdown(context.TODO())
<mask> log.Info("Stopped HTTP server")
<mask> }
<mask>
<mask> // This function is called before application exits
<mask> func cleanupAlways() {
</s> +(dhcpd): added static IP for MacOS </s> remove Context.httpsServer.server.Shutdown(context.TODO())
</s> add _ = Context.httpsServer.server.Shutdown(context.TODO()) </s> remove err = checkPortAvailable(config.BindHost, data.PortHTTPS)
</s> add err = util.CheckPortAvailable(config.BindHost, data.PortHTTPS) </s> remove err = checkPortAvailable(config.BindHost, data.PortHTTPS)
</s> add err = util.CheckPortAvailable(config.BindHost, data.PortHTTPS) </s> remove body = append(body, []byte(add)...)
err = file.SafeWrite("/etc/dhcpcd.conf", body)
if err != nil {
return err
</s> add if runtime.GOOS == "darwin" {
return fmt.Errorf("cannot do that")
// return setStaticIPDarwin(ifaceName) </s> remove err = checkPortAvailable(reqData.DNS.IP, reqData.DNS.Port)
</s> add err = util.CheckPortAvailable(reqData.DNS.IP, reqData.DNS.Port) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/home.go |
ifaces, err := util.GetValidNetInterfacesForWeb() | <mask> log.Printf("Go to https://%s:%d", config.TLS.ServerName, config.TLS.PortHTTPS)
<mask> }
<mask> } else if config.BindHost == "0.0.0.0" {
<mask> log.Println("AdGuard Home is available on the following addresses:")
<mask> ifaces, err := getValidNetInterfacesForWeb()
<mask> if err != nil {
<mask> // That's weird, but we'll ignore it
<mask> address = net.JoinHostPort(config.BindHost, strconv.Itoa(config.BindPort))
<mask> log.Printf("Go to %s://%s", proto, address)
<mask> return
</s> +(dhcpd): added static IP for MacOS </s> remove err = checkPortAvailable(newSettings.Web.IP, newSettings.Web.Port)
</s> add err = util.CheckPortAvailable(newSettings.Web.IP, newSettings.Web.Port) </s> remove
ifaces, e := getValidNetInterfacesForWeb()
</s> add ifaces, e := util.GetValidNetInterfacesForWeb() </s> remove err := configureSyslog()
</s> add err := util.ConfigureSyslog(serviceName) </s> remove setRlimit(config.RlimitNoFile)
</s> add util.SetRlimit(config.RlimitNoFile) </s> remove ifaces, err := getValidNetInterfacesForWeb()
</s> add ifaces, err := util.GetValidNetInterfacesForWeb() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/home.go |
"github.com/AdguardTeam/AdGuardHome/util" | <mask> "syscall"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/kardianos/service"
<mask> )
<mask>
<mask> const (
<mask> launchdStdoutPath = "/var/log/AdGuardHome.stdout.log"
</s> +(dhcpd): added static IP for MacOS | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/service.go |
code, _, err := util.RunCommand("sh", "-c", confPath+" "+action) | <mask> // runInitdCommand runs init.d service command
<mask> // returns command code or error if any
<mask> func runInitdCommand(action string) (int, error) {
<mask> confPath := "/etc/init.d/" + serviceName
<mask> code, _, err := runCommand("sh", "-c", confPath+" "+action)
<mask> return code, err
<mask> }
<mask>
<mask> // isOpenWrt checks if OS is OpenWRT
<mask> func isOpenWrt() bool {
</s> +(dhcpd): added static IP for MacOS </s> remove // GetValidNetInterfaces returns interfaces that are eligible for DNS and/or DHCP
// invalid interface is a ppp interface or the one that doesn't allow broadcasts
func GetValidNetInterfaces() ([]net.Interface, error) {
ifaces, err := net.Interfaces()
if err != nil {
return nil, fmt.Errorf("Couldn't get list of interfaces: %s", err)
}
netIfaces := []net.Interface{}
for i := range ifaces {
if ifaces[i].Flags&net.FlagPointToPoint != 0 {
// this interface is ppp, we're not interested in this one
continue
}
iface := ifaces[i]
netIfaces = append(netIfaces, iface)
}
return netIfaces, nil
}
</s> add </s> remove return nil
</s> add return fmt.Errorf("Cannot set static IP on %s", runtime.GOOS) </s> remove // Get IP address with netmask
func GetFullIP(ifaceName string) string {
cmd := exec.Command("ip", "-oneline", "-family", "inet", "address", "show", ifaceName)
log.Tracef("executing %s %v", cmd.Path, cmd.Args)
d, err := cmd.Output()
if err != nil || cmd.ProcessState.ExitCode() != 0 {
return ""
}
fields := strings.Fields(string(d))
if len(fields) < 4 {
return ""
}
_, _, err = net.ParseCIDR(fields[3])
if err != nil {
return ""
}
return fields[3]
}
// Set a static IP for network interface
// Supports: Raspbian.
</s> add // Set a static IP for the specified network interface </s> remove ip := GetFullIP(ifaceName)
if len(ip) == 0 {
return errors.New("Can't get IP address")
}
ip4, _, err := net.ParseCIDR(ip)
if err != nil {
return err
}
gatewayIP := getGatewayIP(ifaceName)
add := setStaticIPDhcpcdConf(ifaceName, ip, gatewayIP, ip4.String())
body, err := ioutil.ReadFile("/etc/dhcpcd.conf")
if err != nil {
return err
</s> add if runtime.GOOS == "linux" {
return setStaticIPDhcpdConf(ifaceName) </s> remove log.Printf("%s(): called", _Func())
</s> add log.Printf("%s(): called", util.FuncName()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/service.go |
"github.com/AdguardTeam/AdGuardHome/util"
| <mask> "fmt"
<mask> "os"
<mask> "path/filepath"
<mask>
<mask> "github.com/AdguardTeam/golibs/file"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "golang.org/x/crypto/bcrypt"
<mask> yaml "gopkg.in/yaml.v2"
</s> +(dhcpd): added static IP for MacOS | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/upgrade.go |
log.Printf("%s(): called", util.FuncName()) | <mask>
<mask> // The first schema upgrade:
<mask> // No more "dnsfilter.txt", filters are now kept in data/filters/
<mask> func upgradeSchema0to1(diskConfig *map[string]interface{}) error {
<mask> log.Printf("%s(): called", _Func())
<mask>
<mask> dnsFilterPath := filepath.Join(Context.workDir, "dnsfilter.txt")
<mask> if _, err := os.Stat(dnsFilterPath); !os.IsNotExist(err) {
<mask> log.Printf("Deleting %s as we don't need it anymore", dnsFilterPath)
<mask> err = os.Remove(dnsFilterPath)
</s> +(dhcpd): added static IP for MacOS </s> remove log.Printf("%s(): called", _Func())
</s> add log.Printf("%s(): called", util.FuncName()) </s> remove log.Printf("%s(): called", _Func())
</s> add log.Printf("%s(): called", util.FuncName()) </s> remove log.Printf("%s(): called", _Func())
</s> add log.Printf("%s(): called", util.FuncName()) </s> remove log.Printf("%s(): called", _Func())
</s> add log.Printf("%s(): called", util.FuncName()) </s> remove log.Printf("%s(): called", _Func())
</s> add log.Printf("%s(): called", util.FuncName()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/upgrade.go |
log.Printf("%s(): called", util.FuncName()) | <mask> // Second schema upgrade:
<mask> // coredns is now dns in config
<mask> // delete 'Corefile', since we don't use that anymore
<mask> func upgradeSchema1to2(diskConfig *map[string]interface{}) error {
<mask> log.Printf("%s(): called", _Func())
<mask>
<mask> coreFilePath := filepath.Join(Context.workDir, "Corefile")
<mask> if _, err := os.Stat(coreFilePath); !os.IsNotExist(err) {
<mask> log.Printf("Deleting %s as we don't need it anymore", coreFilePath)
<mask> err = os.Remove(coreFilePath)
</s> +(dhcpd): added static IP for MacOS </s> remove log.Printf("%s(): called", _Func())
</s> add log.Printf("%s(): called", util.FuncName()) </s> remove log.Printf("%s(): called", _Func())
</s> add log.Printf("%s(): called", util.FuncName()) </s> remove log.Printf("%s(): called", _Func())
</s> add log.Printf("%s(): called", util.FuncName()) </s> remove log.Printf("%s(): called", _Func())
</s> add log.Printf("%s(): called", util.FuncName()) </s> remove log.Printf("%s(): called", _Func())
</s> add log.Printf("%s(): called", util.FuncName()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/upgrade.go |
log.Printf("%s(): called", util.FuncName()) | <mask>
<mask> // Third schema upgrade:
<mask> // Bootstrap DNS becomes an array
<mask> func upgradeSchema2to3(diskConfig *map[string]interface{}) error {
<mask> log.Printf("%s(): called", _Func())
<mask>
<mask> // Let's read dns configuration from diskConfig
<mask> dnsConfig, ok := (*diskConfig)["dns"]
<mask> if !ok {
<mask> return fmt.Errorf("no DNS configuration in config file")
</s> +(dhcpd): added static IP for MacOS </s> remove log.Printf("%s(): called", _Func())
</s> add log.Printf("%s(): called", util.FuncName()) </s> remove log.Printf("%s(): called", _Func())
</s> add log.Printf("%s(): called", util.FuncName()) </s> remove log.Printf("%s(): called", _Func())
</s> add log.Printf("%s(): called", util.FuncName()) </s> remove log.Printf("%s(): called", _Func())
</s> add log.Printf("%s(): called", util.FuncName()) </s> remove log.Printf("%s(): called", _Func())
</s> add log.Printf("%s(): called", util.FuncName()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/upgrade.go |
log.Printf("%s(): called", util.FuncName()) | <mask> }
<mask>
<mask> // Add use_global_blocked_services=true setting for existing "clients" array
<mask> func upgradeSchema3to4(diskConfig *map[string]interface{}) error {
<mask> log.Printf("%s(): called", _Func())
<mask>
<mask> (*diskConfig)["schema_version"] = 4
<mask>
<mask> clients, ok := (*diskConfig)["clients"]
<mask> if !ok {
</s> +(dhcpd): added static IP for MacOS </s> remove log.Printf("%s(): called", _Func())
</s> add log.Printf("%s(): called", util.FuncName()) </s> remove log.Printf("%s(): called", _Func())
</s> add log.Printf("%s(): called", util.FuncName()) </s> remove log.Printf("%s(): called", _Func())
</s> add log.Printf("%s(): called", util.FuncName()) </s> remove log.Printf("%s(): called", _Func())
</s> add log.Printf("%s(): called", util.FuncName()) </s> remove log.Printf("%s(): called", _Func())
</s> add log.Printf("%s(): called", util.FuncName()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/upgrade.go |
log.Printf("%s(): called", util.FuncName()) | <mask> // - name: "..."
<mask> // password: "..."
<mask> // ...
<mask> func upgradeSchema4to5(diskConfig *map[string]interface{}) error {
<mask> log.Printf("%s(): called", _Func())
<mask>
<mask> (*diskConfig)["schema_version"] = 5
<mask>
<mask> name, ok := (*diskConfig)["auth_name"]
<mask> if !ok {
</s> +(dhcpd): added static IP for MacOS </s> remove log.Printf("%s(): called", _Func())
</s> add log.Printf("%s(): called", util.FuncName()) </s> remove log.Printf("%s(): called", _Func())
</s> add log.Printf("%s(): called", util.FuncName()) </s> remove log.Printf("%s(): called", _Func())
</s> add log.Printf("%s(): called", util.FuncName()) </s> remove log.Printf("%s(): called", _Func())
</s> add log.Printf("%s(): called", util.FuncName()) </s> remove log.Printf("%s(): called", _Func())
</s> add log.Printf("%s(): called", util.FuncName()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/upgrade.go |
log.Printf("%s(): called", util.FuncName()) | <mask> // ids:
<mask> // - 127.0.0.1
<mask> // - ...
<mask> func upgradeSchema5to6(diskConfig *map[string]interface{}) error {
<mask> log.Printf("%s(): called", _Func())
<mask>
<mask> (*diskConfig)["schema_version"] = 6
<mask>
<mask> clients, ok := (*diskConfig)["clients"]
<mask> if !ok {
</s> +(dhcpd): added static IP for MacOS </s> remove log.Printf("%s(): called", _Func())
</s> add log.Printf("%s(): called", util.FuncName()) </s> remove log.Printf("%s(): called", _Func())
</s> add log.Printf("%s(): called", util.FuncName()) </s> remove log.Printf("%s(): called", _Func())
</s> add log.Printf("%s(): called", util.FuncName()) </s> remove log.Printf("%s(): called", _Func())
</s> add log.Printf("%s(): called", util.FuncName()) </s> remove log.Printf("%s(): called", _Func())
</s> add log.Printf("%s(): called", util.FuncName()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/upgrade.go |
"github.com/AdguardTeam/AdGuardHome/util"
| <mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/golibs/cache"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
</s> +(dhcpd): added static IP for MacOS | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/whois.go |
ln := util.SplitNext(&data, '\n') | <mask> m := map[string]string{}
<mask> descr := ""
<mask> netname := ""
<mask> for len(data) != 0 {
<mask> ln := SplitNext(&data, '\n')
<mask> if len(ln) == 0 || ln[0] == '#' || ln[0] == '%' {
<mask> continue
<mask> }
<mask>
<mask> kv := strings.SplitN(ln, ":", 2)
</s> +(dhcpd): added static IP for MacOS </s> remove line := SplitNext(&data, '\n')
</s> add line := util.SplitNext(&data, '\n') </s> remove setRlimit(config.RlimitNoFile)
</s> add util.SetRlimit(config.RlimitNoFile) </s> remove // Get IP address with netmask
func GetFullIP(ifaceName string) string {
cmd := exec.Command("ip", "-oneline", "-family", "inet", "address", "show", ifaceName)
log.Tracef("executing %s %v", cmd.Path, cmd.Args)
d, err := cmd.Output()
if err != nil || cmd.ProcessState.ExitCode() != 0 {
return ""
}
fields := strings.Fields(string(d))
if len(fields) < 4 {
return ""
}
_, _, err = net.ParseCIDR(fields[3])
if err != nil {
return ""
}
return fields[3]
}
// Set a static IP for network interface
// Supports: Raspbian.
</s> add // Set a static IP for the specified network interface </s> remove ip := GetFullIP(ifaceName)
if len(ip) == 0 {
return errors.New("Can't get IP address")
}
ip4, _, err := net.ParseCIDR(ip)
if err != nil {
return err
}
gatewayIP := getGatewayIP(ifaceName)
add := setStaticIPDhcpcdConf(ifaceName, ip, gatewayIP, ip4.String())
body, err := ioutil.ReadFile("/etc/dhcpcd.conf")
if err != nil {
return err
</s> add if runtime.GOOS == "linux" {
return setStaticIPDhcpdConf(ifaceName) </s> remove
interfaceName := getInterfaceByIP(reqData.DNS.IP)
</s> add interfaceName := util.GetInterfaceByIP(reqData.DNS.IP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c27852537d2f5ce62b16c43f4241a15d0fb8c9fd | home/whois.go |
list map[string]*Client // name -> client
ipIndex map[string]*Client // IP -> client
ipHost map[string]*ClientHost // IP -> Hostname | <mask> WhoisInfo [][]string // [[key,value], ...]
<mask> }
<mask>
<mask> type clientsContainer struct {
<mask> list map[string]*Client // name -> client
<mask> ipIndex map[string]*Client // IP -> client
<mask> ipHost map[string]ClientHost // IP -> Hostname
<mask> lock sync.Mutex
<mask> }
<mask>
<mask> // Init initializes clients container
<mask> // Note: this function must be called only once
</s> - whois: couldn't set info on existing auto-clients </s> remove }
clients.ipHost[ip] = ClientHost{
Host: host,
Source: source,
WhoisInfo: c.WhoisInfo,
</s> add } else if ok {
ch.Source = source
} else {
ch = &ClientHost{
Host: host,
Source: source,
}
clients.ipHost[ip] = ch </s> remove // check index
c, ok := clients.ipHost[ip]
if ok && c.Source > source {
</s> add // check auto-clients index
ch, ok := clients.ipHost[ip]
if ok && ch.Source > source { </s> remove ch = ClientHost{
</s> add ch = &ClientHost{ </s> remove clients.ipHost = make(map[string]ClientHost)
</s> add clients.ipHost = make(map[string]*ClientHost) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c299753b6733fd7841ed2acfc8f383df99964da4 | home/clients.go |
clients.ipHost = make(map[string]*ClientHost) | <mask> log.Fatal("clients.list != nil")
<mask> }
<mask> clients.list = make(map[string]*Client)
<mask> clients.ipIndex = make(map[string]*Client)
<mask> clients.ipHost = make(map[string]ClientHost)
<mask>
<mask> go clients.periodicUpdate()
<mask> }
<mask>
<mask> func (clients *clientsContainer) periodicUpdate() {
</s> - whois: couldn't set info on existing auto-clients </s> remove }
clients.ipHost[ip] = ClientHost{
Host: host,
Source: source,
WhoisInfo: c.WhoisInfo,
</s> add } else if ok {
ch.Source = source
} else {
ch = &ClientHost{
Host: host,
Source: source,
}
clients.ipHost[ip] = ch </s> remove ch = ClientHost{
</s> add ch = &ClientHost{ </s> remove // check index
c, ok := clients.ipHost[ip]
if ok && c.Source > source {
</s> add // check auto-clients index
ch, ok := clients.ipHost[ip]
if ok && ch.Source > source { </s> remove list map[string]*Client // name -> client
ipIndex map[string]*Client // IP -> client
ipHost map[string]ClientHost // IP -> Hostname
</s> add list map[string]*Client // name -> client
ipIndex map[string]*Client // IP -> client
ipHost map[string]*ClientHost // IP -> Hostname | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c299753b6733fd7841ed2acfc8f383df99964da4 | home/clients.go |
ch = &ClientHost{ | <mask> log.Debug("Clients: set WHOIS info for auto-client %s: %v", ch.Host, ch.WhoisInfo)
<mask> return
<mask> }
<mask>
<mask> ch = ClientHost{
<mask> Source: ClientSourceWHOIS,
<mask> }
<mask> ch.WhoisInfo = info
<mask> clients.ipHost[ip] = ch
<mask> log.Debug("Clients: set WHOIS info for auto-client with IP %s: %v", ip, ch.WhoisInfo)
</s> - whois: couldn't set info on existing auto-clients </s> remove }
clients.ipHost[ip] = ClientHost{
Host: host,
Source: source,
WhoisInfo: c.WhoisInfo,
</s> add } else if ok {
ch.Source = source
} else {
ch = &ClientHost{
Host: host,
Source: source,
}
clients.ipHost[ip] = ch </s> remove // check index
c, ok := clients.ipHost[ip]
if ok && c.Source > source {
</s> add // check auto-clients index
ch, ok := clients.ipHost[ip]
if ok && ch.Source > source { </s> remove clients.ipHost = make(map[string]ClientHost)
</s> add clients.ipHost = make(map[string]*ClientHost) </s> remove list map[string]*Client // name -> client
ipIndex map[string]*Client // IP -> client
ipHost map[string]ClientHost // IP -> Hostname
</s> add list map[string]*Client // name -> client
ipIndex map[string]*Client // IP -> client
ipHost map[string]*ClientHost // IP -> Hostname | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c299753b6733fd7841ed2acfc8f383df99964da4 | home/clients.go |
// check auto-clients index
ch, ok := clients.ipHost[ip]
if ok && ch.Source > source { | <mask> if ok {
<mask> return false, nil
<mask> }
<mask>
<mask> // check index
<mask> c, ok := clients.ipHost[ip]
<mask> if ok && c.Source > source {
<mask> return false, nil
<mask> }
<mask>
<mask> clients.ipHost[ip] = ClientHost{
<mask> Host: host,
</s> - whois: couldn't set info on existing auto-clients </s> remove }
clients.ipHost[ip] = ClientHost{
Host: host,
Source: source,
WhoisInfo: c.WhoisInfo,
</s> add } else if ok {
ch.Source = source
} else {
ch = &ClientHost{
Host: host,
Source: source,
}
clients.ipHost[ip] = ch </s> remove ch = ClientHost{
</s> add ch = &ClientHost{ </s> remove clients.ipHost = make(map[string]ClientHost)
</s> add clients.ipHost = make(map[string]*ClientHost) </s> remove list map[string]*Client // name -> client
ipIndex map[string]*Client // IP -> client
ipHost map[string]ClientHost // IP -> Hostname
</s> add list map[string]*Client // name -> client
ipIndex map[string]*Client // IP -> client
ipHost map[string]*ClientHost // IP -> Hostname | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c299753b6733fd7841ed2acfc8f383df99964da4 | home/clients.go |
} else if ok {
ch.Source = source
} else {
ch = &ClientHost{
Host: host,
Source: source,
}
clients.ipHost[ip] = ch | <mask> // check index
<mask> c, ok := clients.ipHost[ip]
<mask> if ok && c.Source > source {
<mask> return false, nil
<mask> }
<mask>
<mask> clients.ipHost[ip] = ClientHost{
<mask> Host: host,
<mask> Source: source,
<mask> WhoisInfo: c.WhoisInfo,
<mask> }
<mask> log.Tracef("'%s' -> '%s' [%d]", ip, host, len(clients.ipHost))
<mask> return true, nil
<mask> }
<mask>
</s> - whois: couldn't set info on existing auto-clients </s> remove // check index
c, ok := clients.ipHost[ip]
if ok && c.Source > source {
</s> add // check auto-clients index
ch, ok := clients.ipHost[ip]
if ok && ch.Source > source { </s> remove ch = ClientHost{
</s> add ch = &ClientHost{ </s> remove list map[string]*Client // name -> client
ipIndex map[string]*Client // IP -> client
ipHost map[string]ClientHost // IP -> Hostname
</s> add list map[string]*Client // name -> client
ipIndex map[string]*Client // IP -> client
ipHost map[string]*ClientHost // IP -> Hostname </s> remove clients.ipHost = make(map[string]ClientHost)
</s> add clients.ipHost = make(map[string]*ClientHost) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c299753b6733fd7841ed2acfc8f383df99964da4 | home/clients.go |
"archive/tar" | <mask>
<mask> import (
<mask> "archive/zip"
<mask> "compress/gzip"
<mask> "encoding/json"
<mask> "fmt"
<mask> "io"
</s> * auto-update: use native code to unpack .tar.gz </s> remove err = targzFileUnpack(u.pkgName, u.updateDir)
</s> add _, err = targzFileUnpack(u.pkgName, u.updateDir) </s> remove return nil
</s> add defer f.Close()
gzReader, err := gzip.NewReader(f)
if err != nil {
return nil, fmt.Errorf("gzip.NewReader(): %s", err)
}
var files []string
var err2 error
tarReader := tar.NewReader(gzReader)
for {
header, err := tarReader.Next()
if err == io.EOF {
err2 = nil
break
}
if err != nil {
err2 = fmt.Errorf("tarReader.Next(): %s", err)
break
}
if len(header.Name) == 0 {
continue
}
fn := filepath.Join(outdir, header.Name)
if header.Typeflag == tar.TypeDir {
err = os.Mkdir(fn, os.FileMode(header.Mode&0777))
if err != nil && !os.IsExist(err) {
err2 = fmt.Errorf("os.Mkdir(%s): %s", fn, err)
break
}
log.Tracef("created directory %s", fn)
continue
} else if header.Typeflag != tar.TypeReg {
log.Tracef("%s: unknown file type %d, skipping", header.Name, header.Typeflag)
continue
}
f, err := os.OpenFile(fn, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.FileMode(header.Mode&0777))
if err != nil {
err2 = fmt.Errorf("os.OpenFile(%s): %s", fn, err)
break
}
_, err = io.Copy(f, tarReader)
if err != nil {
f.Close()
err2 = fmt.Errorf("io.Copy(): %s", err)
break
}
f.Close()
log.Tracef("created file %s", fn)
files = append(files, header.Name)
}
gzReader.Close()
return files, err2 </s> remove func targzFileUnpack(tarfile, outdir string) error {
cmd := exec.Command("tar", "zxf", tarfile, "-C", outdir)
log.Tracef("Unpacking: %v", cmd.Args)
_, err := cmd.Output()
if err != nil || cmd.ProcessState.ExitCode() != 0 {
return fmt.Errorf("exec.Command() failed: %s", err)
</s> add // Existing files are overwritten
// Return the list of files (not directories) written
func targzFileUnpack(tarfile, outdir string) ([]string, error) {
f, err := os.Open(tarfile)
if err != nil {
return nil, fmt.Errorf("os.Open(): %s", err) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c2a31f9503566ed4909e65c39d182b179b240086 | control_update.go |
"compress/gzip" | <mask>
<mask> import (
<mask> "archive/tar"
<mask> "archive/zip"
<mask> "encoding/json"
<mask> "fmt"
<mask> "io"
<mask> "io/ioutil"
</s> * auto-update: use native code to unpack .tar.gz </s> remove err = targzFileUnpack(u.pkgName, u.updateDir)
</s> add _, err = targzFileUnpack(u.pkgName, u.updateDir) </s> remove return nil
</s> add defer f.Close()
gzReader, err := gzip.NewReader(f)
if err != nil {
return nil, fmt.Errorf("gzip.NewReader(): %s", err)
}
var files []string
var err2 error
tarReader := tar.NewReader(gzReader)
for {
header, err := tarReader.Next()
if err == io.EOF {
err2 = nil
break
}
if err != nil {
err2 = fmt.Errorf("tarReader.Next(): %s", err)
break
}
if len(header.Name) == 0 {
continue
}
fn := filepath.Join(outdir, header.Name)
if header.Typeflag == tar.TypeDir {
err = os.Mkdir(fn, os.FileMode(header.Mode&0777))
if err != nil && !os.IsExist(err) {
err2 = fmt.Errorf("os.Mkdir(%s): %s", fn, err)
break
}
log.Tracef("created directory %s", fn)
continue
} else if header.Typeflag != tar.TypeReg {
log.Tracef("%s: unknown file type %d, skipping", header.Name, header.Typeflag)
continue
}
f, err := os.OpenFile(fn, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.FileMode(header.Mode&0777))
if err != nil {
err2 = fmt.Errorf("os.OpenFile(%s): %s", fn, err)
break
}
_, err = io.Copy(f, tarReader)
if err != nil {
f.Close()
err2 = fmt.Errorf("io.Copy(): %s", err)
break
}
f.Close()
log.Tracef("created file %s", fn)
files = append(files, header.Name)
}
gzReader.Close()
return files, err2 </s> remove func targzFileUnpack(tarfile, outdir string) error {
cmd := exec.Command("tar", "zxf", tarfile, "-C", outdir)
log.Tracef("Unpacking: %v", cmd.Args)
_, err := cmd.Output()
if err != nil || cmd.ProcessState.ExitCode() != 0 {
return fmt.Errorf("exec.Command() failed: %s", err)
</s> add // Existing files are overwritten
// Return the list of files (not directories) written
func targzFileUnpack(tarfile, outdir string) ([]string, error) {
f, err := os.Open(tarfile)
if err != nil {
return nil, fmt.Errorf("os.Open(): %s", err) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c2a31f9503566ed4909e65c39d182b179b240086 | control_update.go |
// Existing files are overwritten
// Return the list of files (not directories) written
func targzFileUnpack(tarfile, outdir string) ([]string, error) {
f, err := os.Open(tarfile)
if err != nil {
return nil, fmt.Errorf("os.Open(): %s", err) | <mask> return nil
<mask> }
<mask>
<mask> // Unpack all files from .tar.gz file to the specified directory
<mask> func targzFileUnpack(tarfile, outdir string) error {
<mask> cmd := exec.Command("tar", "zxf", tarfile, "-C", outdir)
<mask> log.Tracef("Unpacking: %v", cmd.Args)
<mask> _, err := cmd.Output()
<mask> if err != nil || cmd.ProcessState.ExitCode() != 0 {
<mask> return fmt.Errorf("exec.Command() failed: %s", err)
<mask> }
<mask> return nil
<mask> }
<mask>
<mask> // Perform an update procedure
</s> * auto-update: use native code to unpack .tar.gz </s> remove return nil
</s> add defer f.Close()
gzReader, err := gzip.NewReader(f)
if err != nil {
return nil, fmt.Errorf("gzip.NewReader(): %s", err)
}
var files []string
var err2 error
tarReader := tar.NewReader(gzReader)
for {
header, err := tarReader.Next()
if err == io.EOF {
err2 = nil
break
}
if err != nil {
err2 = fmt.Errorf("tarReader.Next(): %s", err)
break
}
if len(header.Name) == 0 {
continue
}
fn := filepath.Join(outdir, header.Name)
if header.Typeflag == tar.TypeDir {
err = os.Mkdir(fn, os.FileMode(header.Mode&0777))
if err != nil && !os.IsExist(err) {
err2 = fmt.Errorf("os.Mkdir(%s): %s", fn, err)
break
}
log.Tracef("created directory %s", fn)
continue
} else if header.Typeflag != tar.TypeReg {
log.Tracef("%s: unknown file type %d, skipping", header.Name, header.Typeflag)
continue
}
f, err := os.OpenFile(fn, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.FileMode(header.Mode&0777))
if err != nil {
err2 = fmt.Errorf("os.OpenFile(%s): %s", fn, err)
break
}
_, err = io.Copy(f, tarReader)
if err != nil {
f.Close()
err2 = fmt.Errorf("io.Copy(): %s", err)
break
}
f.Close()
log.Tracef("created file %s", fn)
files = append(files, header.Name)
}
gzReader.Close()
return files, err2 </s> remove err = targzFileUnpack(u.pkgName, u.updateDir)
</s> add _, err = targzFileUnpack(u.pkgName, u.updateDir) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c2a31f9503566ed4909e65c39d182b179b240086 | control_update.go |
defer f.Close()
gzReader, err := gzip.NewReader(f)
if err != nil {
return nil, fmt.Errorf("gzip.NewReader(): %s", err)
}
var files []string
var err2 error
tarReader := tar.NewReader(gzReader)
for {
header, err := tarReader.Next()
if err == io.EOF {
err2 = nil
break
}
if err != nil {
err2 = fmt.Errorf("tarReader.Next(): %s", err)
break
}
if len(header.Name) == 0 {
continue
}
fn := filepath.Join(outdir, header.Name)
if header.Typeflag == tar.TypeDir {
err = os.Mkdir(fn, os.FileMode(header.Mode&0777))
if err != nil && !os.IsExist(err) {
err2 = fmt.Errorf("os.Mkdir(%s): %s", fn, err)
break
}
log.Tracef("created directory %s", fn)
continue
} else if header.Typeflag != tar.TypeReg {
log.Tracef("%s: unknown file type %d, skipping", header.Name, header.Typeflag)
continue
}
f, err := os.OpenFile(fn, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.FileMode(header.Mode&0777))
if err != nil {
err2 = fmt.Errorf("os.OpenFile(%s): %s", fn, err)
break
}
_, err = io.Copy(f, tarReader)
if err != nil {
f.Close()
err2 = fmt.Errorf("io.Copy(): %s", err)
break
}
f.Close()
log.Tracef("created file %s", fn)
files = append(files, header.Name)
}
gzReader.Close()
return files, err2 | <mask> _, err := cmd.Output()
<mask> if err != nil || cmd.ProcessState.ExitCode() != 0 {
<mask> return fmt.Errorf("exec.Command() failed: %s", err)
<mask> }
<mask> return nil
<mask> }
<mask>
<mask> // Perform an update procedure
<mask> func doUpdate(u *updateInfo) error {
<mask> log.Info("Updating from %s to %s. URL:%s Package:%s",
</s> * auto-update: use native code to unpack .tar.gz </s> remove func targzFileUnpack(tarfile, outdir string) error {
cmd := exec.Command("tar", "zxf", tarfile, "-C", outdir)
log.Tracef("Unpacking: %v", cmd.Args)
_, err := cmd.Output()
if err != nil || cmd.ProcessState.ExitCode() != 0 {
return fmt.Errorf("exec.Command() failed: %s", err)
</s> add // Existing files are overwritten
// Return the list of files (not directories) written
func targzFileUnpack(tarfile, outdir string) ([]string, error) {
f, err := os.Open(tarfile)
if err != nil {
return nil, fmt.Errorf("os.Open(): %s", err) </s> remove err = targzFileUnpack(u.pkgName, u.updateDir)
</s> add _, err = targzFileUnpack(u.pkgName, u.updateDir) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c2a31f9503566ed4909e65c39d182b179b240086 | control_update.go |
_, err = targzFileUnpack(u.pkgName, u.updateDir) | <mask> if err != nil {
<mask> return fmt.Errorf("zipFileUnpack() failed: %s", err)
<mask> }
<mask> } else if strings.HasSuffix(file, ".tar.gz") {
<mask> err = targzFileUnpack(u.pkgName, u.updateDir)
<mask> if err != nil {
<mask> return fmt.Errorf("zipFileUnpack() failed: %s", err)
<mask> }
<mask> } else {
<mask> return fmt.Errorf("Unknown package extension")
</s> * auto-update: use native code to unpack .tar.gz </s> remove return nil
</s> add defer f.Close()
gzReader, err := gzip.NewReader(f)
if err != nil {
return nil, fmt.Errorf("gzip.NewReader(): %s", err)
}
var files []string
var err2 error
tarReader := tar.NewReader(gzReader)
for {
header, err := tarReader.Next()
if err == io.EOF {
err2 = nil
break
}
if err != nil {
err2 = fmt.Errorf("tarReader.Next(): %s", err)
break
}
if len(header.Name) == 0 {
continue
}
fn := filepath.Join(outdir, header.Name)
if header.Typeflag == tar.TypeDir {
err = os.Mkdir(fn, os.FileMode(header.Mode&0777))
if err != nil && !os.IsExist(err) {
err2 = fmt.Errorf("os.Mkdir(%s): %s", fn, err)
break
}
log.Tracef("created directory %s", fn)
continue
} else if header.Typeflag != tar.TypeReg {
log.Tracef("%s: unknown file type %d, skipping", header.Name, header.Typeflag)
continue
}
f, err := os.OpenFile(fn, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.FileMode(header.Mode&0777))
if err != nil {
err2 = fmt.Errorf("os.OpenFile(%s): %s", fn, err)
break
}
_, err = io.Copy(f, tarReader)
if err != nil {
f.Close()
err2 = fmt.Errorf("io.Copy(): %s", err)
break
}
f.Close()
log.Tracef("created file %s", fn)
files = append(files, header.Name)
}
gzReader.Close()
return files, err2 </s> remove func targzFileUnpack(tarfile, outdir string) error {
cmd := exec.Command("tar", "zxf", tarfile, "-C", outdir)
log.Tracef("Unpacking: %v", cmd.Args)
_, err := cmd.Output()
if err != nil || cmd.ProcessState.ExitCode() != 0 {
return fmt.Errorf("exec.Command() failed: %s", err)
</s> add // Existing files are overwritten
// Return the list of files (not directories) written
func targzFileUnpack(tarfile, outdir string) ([]string, error) {
f, err := os.Open(tarfile)
if err != nil {
return nil, fmt.Errorf("os.Open(): %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c2a31f9503566ed4909e65c39d182b179b240086 | control_update.go |
func testTargzFileUnpack(t *testing.T) {
fn := "./dist/AdGuardHome_v0.95_linux_amd64.tar.gz"
outdir := "./test-unpack"
_ = os.Mkdir(outdir, 0755)
files, e := targzFileUnpack(fn, outdir)
if e != nil {
t.Fatalf("FAILED: %s", e)
}
t.Logf("%v", files)
os.RemoveAll(outdir)
}
| <mask> os.RemoveAll(u.updateDir)
<mask> }
<mask>
<mask> func testZipFileUnpack(t *testing.T) {
<mask> fn := "./dist/AdGuardHome_v0.95_Windows_amd64.zip"
<mask> outdir := "./test-unpack"
<mask> _ = os.Mkdir(outdir, 0755)
</s> * auto-update: use native code to unpack .tar.gz </s> remove func targzFileUnpack(tarfile, outdir string) error {
cmd := exec.Command("tar", "zxf", tarfile, "-C", outdir)
log.Tracef("Unpacking: %v", cmd.Args)
_, err := cmd.Output()
if err != nil || cmd.ProcessState.ExitCode() != 0 {
return fmt.Errorf("exec.Command() failed: %s", err)
</s> add // Existing files are overwritten
// Return the list of files (not directories) written
func targzFileUnpack(tarfile, outdir string) ([]string, error) {
f, err := os.Open(tarfile)
if err != nil {
return nil, fmt.Errorf("os.Open(): %s", err) </s> remove return nil
</s> add defer f.Close()
gzReader, err := gzip.NewReader(f)
if err != nil {
return nil, fmt.Errorf("gzip.NewReader(): %s", err)
}
var files []string
var err2 error
tarReader := tar.NewReader(gzReader)
for {
header, err := tarReader.Next()
if err == io.EOF {
err2 = nil
break
}
if err != nil {
err2 = fmt.Errorf("tarReader.Next(): %s", err)
break
}
if len(header.Name) == 0 {
continue
}
fn := filepath.Join(outdir, header.Name)
if header.Typeflag == tar.TypeDir {
err = os.Mkdir(fn, os.FileMode(header.Mode&0777))
if err != nil && !os.IsExist(err) {
err2 = fmt.Errorf("os.Mkdir(%s): %s", fn, err)
break
}
log.Tracef("created directory %s", fn)
continue
} else if header.Typeflag != tar.TypeReg {
log.Tracef("%s: unknown file type %d, skipping", header.Name, header.Typeflag)
continue
}
f, err := os.OpenFile(fn, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.FileMode(header.Mode&0777))
if err != nil {
err2 = fmt.Errorf("os.OpenFile(%s): %s", fn, err)
break
}
_, err = io.Copy(f, tarReader)
if err != nil {
f.Close()
err2 = fmt.Errorf("io.Copy(): %s", err)
break
}
f.Close()
log.Tracef("created file %s", fn)
files = append(files, header.Name)
}
gzReader.Close()
return files, err2 </s> remove err = targzFileUnpack(u.pkgName, u.updateDir)
</s> add _, err = targzFileUnpack(u.pkgName, u.updateDir) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c2a31f9503566ed4909e65c39d182b179b240086 | control_update_test.go |
// Return TRUE if host names doesn't contain disallowed characters
func isHostnameOK(hostname string) bool {
for _, c := range hostname {
if !((c >= 'a' && c <= 'z') ||
(c >= 'A' && c <= 'Z') ||
(c >= '0' && c <= '9') ||
c == '.' || c == '-') {
log.Debug("DNS: skipping invalid hostname %s from DHCP", hostname)
return false
}
}
return true
}
| <mask> }
<mask>
<mask> func (s *Server) onDHCPLeaseChanged(flags int) {
<mask> switch flags {
<mask> case dhcpd.LeaseChangedAdded,
<mask> dhcpd.LeaseChangedAddedStatic,
<mask> dhcpd.LeaseChangedRemovedStatic:
</s> * DNS: resolve host names from DHCP: improve
#1956
Squashed commit of the following:
commit efeacd92b8b82a9a0a0cce8c5648f2d024b4bc9e
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Aug 18 13:54:15 2020 +0300
* DNS: resolve host names from DHCP: improve
. Require a valid host name from DHCP lease
. Use lower-case names </s> remove if len(l.Hostname) == 0 {
</s> add if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) { </s> remove m[l.IP.String()] = l.Hostname
</s> add lowhost := strings.ToLower(l.Hostname)
m[l.IP.String()] = lowhost </s> remove hostToIP[l.Hostname] = ip
</s> add hostToIP[lowhost] = ip | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c3123473cfbcd53d0be3aecdf5f6fe97f7d61f5b | dnsforward/handle_dns.go |
if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) { | <mask>
<mask> ll := s.dhcpServer.Leases(dhcpd.LeasesAll)
<mask>
<mask> for _, l := range ll {
<mask> if len(l.Hostname) == 0 {
<mask> continue
<mask> }
<mask>
<mask> m[l.IP.String()] = l.Hostname
<mask>
</s> * DNS: resolve host names from DHCP: improve
#1956
Squashed commit of the following:
commit efeacd92b8b82a9a0a0cce8c5648f2d024b4bc9e
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Aug 18 13:54:15 2020 +0300
* DNS: resolve host names from DHCP: improve
. Require a valid host name from DHCP lease
. Use lower-case names </s> remove m[l.IP.String()] = l.Hostname
</s> add lowhost := strings.ToLower(l.Hostname)
m[l.IP.String()] = lowhost </s> remove hostToIP[l.Hostname] = ip
</s> add hostToIP[lowhost] = ip | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c3123473cfbcd53d0be3aecdf5f6fe97f7d61f5b | dnsforward/handle_dns.go |
lowhost := strings.ToLower(l.Hostname)
m[l.IP.String()] = lowhost | <mask> if len(l.Hostname) == 0 {
<mask> continue
<mask> }
<mask>
<mask> m[l.IP.String()] = l.Hostname
<mask>
<mask> ip := make(net.IP, 4)
<mask> copy(ip, l.IP.To4())
<mask> hostToIP[l.Hostname] = ip
<mask> }
</s> * DNS: resolve host names from DHCP: improve
#1956
Squashed commit of the following:
commit efeacd92b8b82a9a0a0cce8c5648f2d024b4bc9e
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Aug 18 13:54:15 2020 +0300
* DNS: resolve host names from DHCP: improve
. Require a valid host name from DHCP lease
. Use lower-case names </s> remove if len(l.Hostname) == 0 {
</s> add if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) { </s> remove hostToIP[l.Hostname] = ip
</s> add hostToIP[lowhost] = ip | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c3123473cfbcd53d0be3aecdf5f6fe97f7d61f5b | dnsforward/handle_dns.go |
hostToIP[lowhost] = ip | <mask> m[l.IP.String()] = l.Hostname
<mask>
<mask> ip := make(net.IP, 4)
<mask> copy(ip, l.IP.To4())
<mask> hostToIP[l.Hostname] = ip
<mask> }
<mask>
<mask> log.Debug("DNS: added %d A/PTR entries from DHCP", len(m))
<mask>
<mask> s.tableHostToIPLock.Lock()
</s> * DNS: resolve host names from DHCP: improve
#1956
Squashed commit of the following:
commit efeacd92b8b82a9a0a0cce8c5648f2d024b4bc9e
Author: Simon Zolin <s.zolin@adguard.com>
Date: Tue Aug 18 13:54:15 2020 +0300
* DNS: resolve host names from DHCP: improve
. Require a valid host name from DHCP lease
. Use lower-case names </s> remove m[l.IP.String()] = l.Hostname
</s> add lowhost := strings.ToLower(l.Hostname)
m[l.IP.String()] = lowhost </s> remove if len(l.Hostname) == 0 {
</s> add if len(l.Hostname) == 0 || !isHostnameOK(l.Hostname) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c3123473cfbcd53d0be3aecdf5f6fe97f7d61f5b | dnsforward/handle_dns.go |
err = dhcpServer.CheckConfig(newconfig.ServerConfig)
if err != nil {
httpError(w, http.StatusBadRequest, "Invalid DHCP configuration: %s", err)
return
}
| <mask> return
<mask> }
<mask>
<mask> err = dhcpServer.Stop()
<mask> if err != nil {
<mask> log.Error("failed to stop the DHCP server: %s", err)
<mask> }
</s> * control: use new DHCP functions: CheckConfig, Init, Start </s> remove err = dhcpServer.Start(&newconfig.ServerConfig)
</s> add err = dhcpServer.Start() </s> remove err := dhcpServer.Start(&config.DHCP)
</s> add err := dhcpServer.Init(config.DHCP)
if err != nil {
return errorx.Decorate(err, "Couldn't init DHCP server")
}
err = dhcpServer.Start() | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c3204664c391de9cde30577e60f315998b9dd048 | dhcp.go |
err = dhcpServer.Init(newconfig.ServerConfig)
if err != nil {
httpError(w, http.StatusBadRequest, "Invalid DHCP configuration: %s", err)
return
}
| <mask> }
<mask>
<mask> if newconfig.Enabled {
<mask>
<mask> staticIP, err := hasStaticIP(newconfig.InterfaceName)
<mask> if !staticIP && err == nil {
<mask> err = setStaticIP(newconfig.InterfaceName)
</s> * control: use new DHCP functions: CheckConfig, Init, Start </s> remove err := dhcpServer.Start(&config.DHCP)
</s> add err := dhcpServer.Init(config.DHCP)
if err != nil {
return errorx.Decorate(err, "Couldn't init DHCP server")
}
err = dhcpServer.Start() </s> remove err = dhcpServer.Start(&newconfig.ServerConfig)
</s> add err = dhcpServer.Start() | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c3204664c391de9cde30577e60f315998b9dd048 | dhcp.go |
err = dhcpServer.Start() | <mask> return
<mask> }
<mask> }
<mask>
<mask> err = dhcpServer.Start(&newconfig.ServerConfig)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "Failed to start DHCP server: %s", err)
<mask> return
<mask> }
<mask> }
</s> * control: use new DHCP functions: CheckConfig, Init, Start </s> remove err := dhcpServer.Start(&config.DHCP)
</s> add err := dhcpServer.Init(config.DHCP)
if err != nil {
return errorx.Decorate(err, "Couldn't init DHCP server")
}
err = dhcpServer.Start() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c3204664c391de9cde30577e60f315998b9dd048 | dhcp.go |
err := dhcpServer.Init(config.DHCP)
if err != nil {
return errorx.Decorate(err, "Couldn't init DHCP server")
}
err = dhcpServer.Start() | <mask> if !config.DHCP.Enabled {
<mask> // not enabled, don't do anything
<mask> return nil
<mask> }
<mask> err := dhcpServer.Start(&config.DHCP)
<mask> if err != nil {
<mask> return errorx.Decorate(err, "Couldn't start DHCP server")
<mask> }
<mask> return nil
<mask> }
</s> * control: use new DHCP functions: CheckConfig, Init, Start </s> remove err = dhcpServer.Start(&newconfig.ServerConfig)
</s> add err = dhcpServer.Start() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c3204664c391de9cde30577e60f315998b9dd048 | dhcp.go |
<textarea className="form-control form-control--textarea" value={this.props.userRules} onChange={this.handleChange} /> | <mask> title="Custom filtering rules"
<mask> subtitle="Enter one rule on a line. You can use either adblock rules or hosts files syntax."
<mask> >
<mask> <form onSubmit={this.handleSubmit}>
<mask> <textarea className="form-control" value={this.props.userRules} onChange={this.handleChange} />
<mask> <div className="card-actions">
<mask> <button
<mask> className="btn btn-success btn-standart"
<mask> type="submit"
<mask> onClick={this.handleSubmit}
</s> Add "block" and "unblock" buttons to the Query Log </s> remove const { queryLogs, dashboard } = state;
const props = { queryLogs, dashboard };
</s> add const { queryLogs, dashboard, filtering } = state;
const props = { queryLogs, dashboard, filtering }; </s> remove { this.renderTooltip(isFiltered, rule) }
</s> add {this.renderTooltip(isFiltered, rule)} </s> remove { this.renderTooltip(isFiltered, rule)}
</s> add {this.renderTooltip(isFiltered, rule)} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c40f7b4d5c62bd45fc2d80545d3a8b2f8366436d | client/src/components/Filters/UserRules.js |
position: relative; | <mask> .logs__row {
<mask> display: flex;
<mask> align-items: center;
<mask> min-height: 26px;
<mask> }
<mask>
<mask> .logs__row--overflow {
</s> Add "block" and "unblock" buttons to the Query Log </s> remove import { getLogs, toggleLogStatus, downloadQueryLog } from '../actions';
</s> add import { getLogs, toggleLogStatus, downloadQueryLog, getFilteringStatus, setRules, addSuccessToast } from '../actions'; </s> remove const { queryLogs, dashboard } = state;
const props = { queryLogs, dashboard };
</s> add const { queryLogs, dashboard, filtering } = state;
const props = { queryLogs, dashboard, filtering }; </s> remove { this.renderTooltip(isFiltered, rule) }
</s> add {this.renderTooltip(isFiltered, rule)} | [
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c40f7b4d5c62bd45fc2d80545d3a8b2f8366436d | client/src/components/Logs/Logs.css |
min-height: 26px; | <mask> .logs__row {
<mask> position: relative;
<mask> display: flex;
<mask> align-items: center;
<mask> }
<mask>
<mask> .logs__row--overflow {
<mask> overflow: hidden;
<mask> }
</s> Add "block" and "unblock" buttons to the Query Log </s> remove import { getLogs, toggleLogStatus, downloadQueryLog } from '../actions';
</s> add import { getLogs, toggleLogStatus, downloadQueryLog, getFilteringStatus, setRules, addSuccessToast } from '../actions'; </s> remove { this.renderTooltip(isFiltered, rule) }
</s> add {this.renderTooltip(isFiltered, rule)} </s> remove const { queryLogs, dashboard } = state;
const props = { queryLogs, dashboard };
</s> add const { queryLogs, dashboard, filtering } = state;
const props = { queryLogs, dashboard, filtering }; </s> remove import React, { Component } from 'react';
</s> add import React, { Component, Fragment } from 'react'; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c40f7b4d5c62bd45fc2d80545d3a8b2f8366436d | client/src/components/Logs/Logs.css |
import React, { Component, Fragment } from 'react'; | <mask> import React, { Component } from 'react';
<mask> import PropTypes from 'prop-types';
<mask> import ReactTable from 'react-table';
<mask> import { saveAs } from 'file-saver/FileSaver';
<mask> import PageTitle from '../ui/PageTitle';
<mask> import Card from '../ui/Card';
</s> Add "block" and "unblock" buttons to the Query Log </s> remove import { getLogs, toggleLogStatus, downloadQueryLog } from '../actions';
</s> add import { getLogs, toggleLogStatus, downloadQueryLog, getFilteringStatus, setRules, addSuccessToast } from '../actions'; </s> remove const { queryLogs, dashboard } = state;
const props = { queryLogs, dashboard };
</s> add const { queryLogs, dashboard, filtering } = state;
const props = { queryLogs, dashboard, filtering }; </s> remove { this.renderTooltip(isFiltered, rule) }
</s> add {this.renderTooltip(isFiltered, rule)} | [
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c40f7b4d5c62bd45fc2d80545d3a8b2f8366436d | client/src/components/Logs/index.js |
import escapeRegExp from 'lodash/escapeRegExp';
import endsWith from 'lodash/endsWith'; | <mask> import PropTypes from 'prop-types';
<mask> import ReactTable from 'react-table';
<mask> import { saveAs } from 'file-saver/FileSaver';
<mask> import PageTitle from '../ui/PageTitle';
<mask> import Card from '../ui/Card';
<mask> import Loading from '../ui/Loading';
<mask> import Tooltip from '../ui/Tooltip';
<mask> import './Logs.css';
<mask>
</s> Add "block" and "unblock" buttons to the Query Log </s> remove import React, { Component } from 'react';
</s> add import React, { Component, Fragment } from 'react'; </s> remove import { getLogs, toggleLogStatus, downloadQueryLog } from '../actions';
</s> add import { getLogs, toggleLogStatus, downloadQueryLog, getFilteringStatus, setRules, addSuccessToast } from '../actions'; </s> remove const { queryLogs, dashboard } = state;
const props = { queryLogs, dashboard };
</s> add const { queryLogs, dashboard, filtering } = state;
const props = { queryLogs, dashboard, filtering }; </s> remove { this.renderTooltip(isFiltered, rule) }
</s> add {this.renderTooltip(isFiltered, rule)} | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c40f7b4d5c62bd45fc2d80545d3a8b2f8366436d | client/src/components/Logs/index.js |
this.props.getFilteringStatus(); | <mask> componentDidMount() {
<mask> this.getLogs();
<mask> }
<mask>
<mask> componentDidUpdate(prevProps) {
<mask> // get logs when queryLog becomes enabled
<mask> if (this.props.dashboard.queryLogEnabled && !prevProps.dashboard.queryLogEnabled) {
</s> Add "block" and "unblock" buttons to the Query Log </s> remove import { getLogs, toggleLogStatus, downloadQueryLog } from '../actions';
</s> add import { getLogs, toggleLogStatus, downloadQueryLog, getFilteringStatus, setRules, addSuccessToast } from '../actions'; </s> remove const { queryLogs, dashboard } = state;
const props = { queryLogs, dashboard };
</s> add const { queryLogs, dashboard, filtering } = state;
const props = { queryLogs, dashboard, filtering }; | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c40f7b4d5c62bd45fc2d80545d3a8b2f8366436d | client/src/components/Logs/index.js |
{this.renderTooltip(isFiltered, rule)} | <mask> const liNodes = responses.map((response, index) =>
<mask> (<li key={index} title={response}>{response}</li>));
<mask> return (
<mask> <div className="logs__row">
<mask> { this.renderTooltip(isFiltered, rule)}
<mask> <ul className="list-unstyled">{liNodes}</ul>
<mask> </div>
<mask> );
<mask> }
<mask> return (
</s> Add "block" and "unblock" buttons to the Query Log </s> remove { this.renderTooltip(isFiltered, rule) }
</s> add {this.renderTooltip(isFiltered, rule)} </s> remove const { queryLogs, dashboard } = state;
const props = { queryLogs, dashboard };
</s> add const { queryLogs, dashboard, filtering } = state;
const props = { queryLogs, dashboard, filtering }; </s> remove import { getLogs, toggleLogStatus, downloadQueryLog } from '../actions';
</s> add import { getLogs, toggleLogStatus, downloadQueryLog, getFilteringStatus, setRules, addSuccessToast } from '../actions'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c40f7b4d5c62bd45fc2d80545d3a8b2f8366436d | client/src/components/Logs/index.js |
{this.renderTooltip(isFiltered, rule)} | <mask> );
<mask> }
<mask> return (
<mask> <div className="logs__row">
<mask> { this.renderTooltip(isFiltered, rule) }
<mask> <span>Empty</span>
<mask> </div>
<mask> );
<mask> },
<mask> }, {
</s> Add "block" and "unblock" buttons to the Query Log </s> remove { this.renderTooltip(isFiltered, rule)}
</s> add {this.renderTooltip(isFiltered, rule)} </s> remove const { queryLogs, dashboard } = state;
const props = { queryLogs, dashboard };
</s> add const { queryLogs, dashboard, filtering } = state;
const props = { queryLogs, dashboard, filtering }; </s> remove import { getLogs, toggleLogStatus, downloadQueryLog } from '../actions';
</s> add import { getLogs, toggleLogStatus, downloadQueryLog, getFilteringStatus, setRules, addSuccessToast } from '../actions'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c40f7b4d5c62bd45fc2d80545d3a8b2f8366436d | client/src/components/Logs/index.js |
Cell: (row) => {
const { reason } = row.original;
const isFiltered = row ? reason.indexOf('Filtered') === 0 : false;
return (
<Fragment>
<div className="logs__row">
{row.value}
</div>
{this.renderBlockingButton(isFiltered, row.original.domain)}
</Fragment>
);
}, | <mask> accessor: 'client',
<mask> maxWidth: 250,
<mask> },
<mask> ];
<mask>
<mask> if (logs) {
<mask> return (<ReactTable
</s> Add "block" and "unblock" buttons to the Query Log </s> remove { this.renderTooltip(isFiltered, rule) }
</s> add {this.renderTooltip(isFiltered, rule)} </s> remove { this.renderTooltip(isFiltered, rule)}
</s> add {this.renderTooltip(isFiltered, rule)} </s> remove const { queryLogs, dashboard } = state;
const props = { queryLogs, dashboard };
</s> add const { queryLogs, dashboard, filtering } = state;
const props = { queryLogs, dashboard, filtering }; | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c40f7b4d5c62bd45fc2d80545d3a8b2f8366436d | client/src/components/Logs/index.js |
className='logs__table' | <mask> ];
<mask>
<mask> if (logs) {
<mask> return (<ReactTable
<mask> data={logs}
<mask> columns={columns}
<mask> showPagination={false}
<mask> defaultPageSize={1000}
</s> Add "block" and "unblock" buttons to the Query Log </s> remove { this.renderTooltip(isFiltered, rule) }
</s> add {this.renderTooltip(isFiltered, rule)} </s> remove { this.renderTooltip(isFiltered, rule)}
</s> add {this.renderTooltip(isFiltered, rule)} </s> remove const { queryLogs, dashboard } = state;
const props = { queryLogs, dashboard };
</s> add const { queryLogs, dashboard, filtering } = state;
const props = { queryLogs, dashboard, filtering }; | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c40f7b4d5c62bd45fc2d80545d3a8b2f8366436d | client/src/components/Logs/index.js |
getFilteringStatus: PropTypes.func,
filtering: PropTypes.object,
userRules: PropTypes.string,
setRules: PropTypes.func,
addSuccessToast: PropTypes.func, | <mask> dashboard: PropTypes.object,
<mask> toggleLogStatus: PropTypes.func,
<mask> downloadQueryLog: PropTypes.func,
<mask> };
<mask>
<mask> export default Logs;
</s> Add "block" and "unblock" buttons to the Query Log </s> remove const { queryLogs, dashboard } = state;
const props = { queryLogs, dashboard };
</s> add const { queryLogs, dashboard, filtering } = state;
const props = { queryLogs, dashboard, filtering }; </s> remove import { getLogs, toggleLogStatus, downloadQueryLog } from '../actions';
</s> add import { getLogs, toggleLogStatus, downloadQueryLog, getFilteringStatus, setRules, addSuccessToast } from '../actions'; | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c40f7b4d5c62bd45fc2d80545d3a8b2f8366436d | client/src/components/Logs/index.js |
import { getLogs, toggleLogStatus, downloadQueryLog, getFilteringStatus, setRules, addSuccessToast } from '../actions'; | <mask> import { connect } from 'react-redux';
<mask> import { getLogs, toggleLogStatus, downloadQueryLog } from '../actions';
<mask> import Logs from '../components/Logs';
<mask>
<mask> const mapStateToProps = (state) => {
<mask> const { queryLogs, dashboard } = state;
<mask> const props = { queryLogs, dashboard };
</s> Add "block" and "unblock" buttons to the Query Log </s> remove const { queryLogs, dashboard } = state;
const props = { queryLogs, dashboard };
</s> add const { queryLogs, dashboard, filtering } = state;
const props = { queryLogs, dashboard, filtering }; </s> remove import React, { Component } from 'react';
</s> add import React, { Component, Fragment } from 'react'; </s> remove { this.renderTooltip(isFiltered, rule)}
</s> add {this.renderTooltip(isFiltered, rule)} | [
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c40f7b4d5c62bd45fc2d80545d3a8b2f8366436d | client/src/containers/Logs.js |
const { queryLogs, dashboard, filtering } = state;
const props = { queryLogs, dashboard, filtering }; | <mask> import { getLogs, toggleLogStatus, downloadQueryLog } from '../actions';
<mask> import Logs from '../components/Logs';
<mask>
<mask> const mapStateToProps = (state) => {
<mask> const { queryLogs, dashboard } = state;
<mask> const props = { queryLogs, dashboard };
<mask> return props;
<mask> };
<mask>
<mask> const mapDispatchToProps = {
<mask> getLogs,
</s> Add "block" and "unblock" buttons to the Query Log </s> remove import { getLogs, toggleLogStatus, downloadQueryLog } from '../actions';
</s> add import { getLogs, toggleLogStatus, downloadQueryLog, getFilteringStatus, setRules, addSuccessToast } from '../actions'; </s> remove { this.renderTooltip(isFiltered, rule)}
</s> add {this.renderTooltip(isFiltered, rule)} </s> remove import React, { Component } from 'react';
</s> add import React, { Component, Fragment } from 'react'; | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c40f7b4d5c62bd45fc2d80545d3a8b2f8366436d | client/src/containers/Logs.js |
getFilteringStatus,
setRules,
addSuccessToast, | <mask> toggleLogStatus,
<mask> downloadQueryLog,
<mask> };
<mask>
<mask> export default connect(
<mask> mapStateToProps,
<mask> mapDispatchToProps,
<mask> )(Logs);
</s> Add "block" and "unblock" buttons to the Query Log </s> remove import { getLogs, toggleLogStatus, downloadQueryLog } from '../actions';
</s> add import { getLogs, toggleLogStatus, downloadQueryLog, getFilteringStatus, setRules, addSuccessToast } from '../actions'; </s> remove const { queryLogs, dashboard } = state;
const props = { queryLogs, dashboard };
</s> add const { queryLogs, dashboard, filtering } = state;
const props = { queryLogs, dashboard, filtering }; | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c40f7b4d5c62bd45fc2d80545d3a8b2f8366436d | client/src/containers/Logs.js |
<p className="setup__desc text-center"> | <mask> <div className="setup__group">
<mask> <h1 className="setup__title">
<mask> <Trans>install_welcome_title</Trans>
<mask> </h1>
<mask> <p className="setup__desc">
<mask> <Trans>install_welcome_desc</Trans>
<mask> </p>
<mask> </div>
<mask> <Controls />
<mask> </div>
</s> Check if ip_addresses exist in the interface </s> remove return (
<option value={ip} key={name}>
{name} - {ip}
</option>
);
</s> add if (option.ip_addresses && option.ip_addresses.length > 0) {
const ip = getInterfaceIp(option);
return (
<option value={ip} key={name}>
{name} - {ip}
</option>
);
}
return false; </s> remove const ip = getInterfaceIp(option);
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c466f8cc7387a6803876e3869ad18a1e8aaffcaf | client/src/install/Setup/Greeting.js |
<mask> const renderInterfaces = (interfaces => (
<mask> Object.keys(interfaces).map((item) => {
<mask> const option = interfaces[item];
<mask> const { name } = option;
<mask> const ip = getInterfaceIp(option);
<mask>
<mask> return (
<mask> <option value={ip} key={name}>
<mask> {name} - {ip}
<mask> </option>
</s> Check if ip_addresses exist in the interface </s> remove return (
<option value={ip} key={name}>
{name} - {ip}
</option>
);
</s> add if (option.ip_addresses && option.ip_addresses.length > 0) {
const ip = getInterfaceIp(option);
return (
<option value={ip} key={name}>
{name} - {ip}
</option>
);
}
return false; </s> remove <p className="setup__desc">
</s> add <p className="setup__desc text-center"> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c466f8cc7387a6803876e3869ad18a1e8aaffcaf | client/src/install/Setup/Settings.js | |
if (option.ip_addresses && option.ip_addresses.length > 0) {
const ip = getInterfaceIp(option);
return (
<option value={ip} key={name}>
{name} - {ip}
</option>
);
}
return false; | <mask> const option = interfaces[item];
<mask> const { name } = option;
<mask> const ip = getInterfaceIp(option);
<mask>
<mask> return (
<mask> <option value={ip} key={name}>
<mask> {name} - {ip}
<mask> </option>
<mask> );
<mask> })
<mask> ));
<mask>
<mask> let Settings = (props) => {
<mask> const {
</s> Check if ip_addresses exist in the interface </s> remove const ip = getInterfaceIp(option);
</s> add </s> remove <p className="setup__desc">
</s> add <p className="setup__desc text-center"> | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c466f8cc7387a6803876e3869ad18a1e8aaffcaf | client/src/install/Setup/Settings.js |
<mask> parentalCache gcache.Cache
<mask> safeSearchCache gcache.Cache
<mask> )
<mask>
<mask> var resolverAddr string // DNS server address
<mask>
<mask> // Result holds state of hostname check
<mask> type Result struct {
<mask> IsFiltered bool `json:",omitempty"` // True if the host name is filtered
<mask> Reason Reason `json:",omitempty"` // Reason for blocking / unblocking
<mask> Rule string `json:",omitempty"` // Original rule text
</s> * dnsfilter: don't use global variable for custom resolver function </s> remove var firstErr error
firstErr = nil
for _, a := range addrs {
addr = fmt.Sprintf("%s:%s", a.String(), port)
con, err := dialer.DialContext(ctx, network, addr)
if err != nil {
if firstErr == nil {
firstErr = err
</s> add var firstErr error
firstErr = nil
for _, a := range addrs {
addr = fmt.Sprintf("%s:%s", a.String(), port)
con, err := dialer.DialContext(ctx, network, addr)
if err != nil {
if firstErr == nil {
firstErr = err
}
continue </s> remove r := upstream.NewResolver(resolverAddr, 30*time.Second)
addrs, e := r.LookupIPAddr(ctx, host)
log.Tracef("LookupIPAddr: %s: %v", host, addrs)
if e != nil {
return nil, e
}
</s> add r := upstream.NewResolver(resolverAddr, 30*time.Second)
addrs, e := r.LookupIPAddr(ctx, host)
log.Tracef("LookupIPAddr: %s: %v", host, addrs)
if e != nil {
return nil, e
} </s> remove resolverAddr = c.ResolverAddress
d.transport.DialContext = customDialContext
</s> add d.transport.DialContext = createCustomDialContext(c.ResolverAddress) </s> remove host, port, err := net.SplitHostPort(addr)
if err != nil {
return nil, err
}
</s> add host, port, err := net.SplitHostPort(addr)
if err != nil {
return nil, err
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c4e67690f4fcceb055cbea73610b5974855db96f | dnsfilter/dnsfilter.go | |
type dialFunctionType func(ctx context.Context, network, addr string) (net.Conn, error)
| <mask> //
<mask>
<mask> // Connect to a remote server resolving hostname using our own DNS server
<mask> func createCustomDialContext(resolverAddr string) dialFunctionType {
<mask> return func(ctx context.Context, network, addr string) (net.Conn, error) {
<mask> log.Tracef("network:%v addr:%v", network, addr)
</s> * dnsfilter: don't use global variable for custom resolver function </s> remove func customDialContext(ctx context.Context, network, addr string) (net.Conn, error) {
log.Tracef("network:%v addr:%v", network, addr)
</s> add func createCustomDialContext(resolverAddr string) dialFunctionType {
return func(ctx context.Context, network, addr string) (net.Conn, error) {
log.Tracef("network:%v addr:%v", network, addr) </s> remove host, port, err := net.SplitHostPort(addr)
if err != nil {
return nil, err
}
</s> add host, port, err := net.SplitHostPort(addr)
if err != nil {
return nil, err
} </s> remove var firstErr error
firstErr = nil
for _, a := range addrs {
addr = fmt.Sprintf("%s:%s", a.String(), port)
con, err := dialer.DialContext(ctx, network, addr)
if err != nil {
if firstErr == nil {
firstErr = err
</s> add var firstErr error
firstErr = nil
for _, a := range addrs {
addr = fmt.Sprintf("%s:%s", a.String(), port)
con, err := dialer.DialContext(ctx, network, addr)
if err != nil {
if firstErr == nil {
firstErr = err
}
continue </s> remove if net.ParseIP(host) != nil {
con, err := dialer.DialContext(ctx, network, addr)
return con, err
}
</s> add if net.ParseIP(host) != nil {
con, err := dialer.DialContext(ctx, network, addr)
return con, err
} </s> remove r := upstream.NewResolver(resolverAddr, 30*time.Second)
addrs, e := r.LookupIPAddr(ctx, host)
log.Tracef("LookupIPAddr: %s: %v", host, addrs)
if e != nil {
return nil, e
}
</s> add r := upstream.NewResolver(resolverAddr, 30*time.Second)
addrs, e := r.LookupIPAddr(ctx, host)
log.Tracef("LookupIPAddr: %s: %v", host, addrs)
if e != nil {
return nil, e
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c4e67690f4fcceb055cbea73610b5974855db96f | dnsfilter/dnsfilter.go |
func createCustomDialContext(resolverAddr string) dialFunctionType {
return func(ctx context.Context, network, addr string) (net.Conn, error) {
log.Tracef("network:%v addr:%v", network, addr) | <mask> // lifecycle helper functions
<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)
<mask>
<mask> host, port, err := net.SplitHostPort(addr)
<mask> if err != nil {
<mask> return nil, err
<mask> }
</s> * dnsfilter: don't use global variable for custom resolver function </s> remove host, port, err := net.SplitHostPort(addr)
if err != nil {
return nil, err
}
</s> add host, port, err := net.SplitHostPort(addr)
if err != nil {
return nil, err
} </s> remove var firstErr error
firstErr = nil
for _, a := range addrs {
addr = fmt.Sprintf("%s:%s", a.String(), port)
con, err := dialer.DialContext(ctx, network, addr)
if err != nil {
if firstErr == nil {
firstErr = err
</s> add var firstErr error
firstErr = nil
for _, a := range addrs {
addr = fmt.Sprintf("%s:%s", a.String(), port)
con, err := dialer.DialContext(ctx, network, addr)
if err != nil {
if firstErr == nil {
firstErr = err
}
continue </s> remove if net.ParseIP(host) != nil {
con, err := dialer.DialContext(ctx, network, addr)
return con, err
}
</s> add if net.ParseIP(host) != nil {
con, err := dialer.DialContext(ctx, network, addr)
return con, err
} </s> remove r := upstream.NewResolver(resolverAddr, 30*time.Second)
addrs, e := r.LookupIPAddr(ctx, host)
log.Tracef("LookupIPAddr: %s: %v", host, addrs)
if e != nil {
return nil, e
}
</s> add r := upstream.NewResolver(resolverAddr, 30*time.Second)
addrs, e := r.LookupIPAddr(ctx, host)
log.Tracef("LookupIPAddr: %s: %v", host, addrs)
if e != nil {
return nil, e
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c4e67690f4fcceb055cbea73610b5974855db96f | dnsfilter/dnsfilter.go |
host, port, err := net.SplitHostPort(addr)
if err != nil {
return nil, err
} | <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)
<mask>
<mask> host, port, err := net.SplitHostPort(addr)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> dialer := &net.Dialer{
<mask> Timeout: time.Minute * 5,
<mask> }
<mask>
</s> * dnsfilter: don't use global variable for custom resolver function </s> remove func customDialContext(ctx context.Context, network, addr string) (net.Conn, error) {
log.Tracef("network:%v addr:%v", network, addr)
</s> add func createCustomDialContext(resolverAddr string) dialFunctionType {
return func(ctx context.Context, network, addr string) (net.Conn, error) {
log.Tracef("network:%v addr:%v", network, addr) </s> remove dialer := &net.Dialer{
Timeout: time.Minute * 5,
}
</s> add dialer := &net.Dialer{
Timeout: time.Minute * 5,
} </s> remove if net.ParseIP(host) != nil {
con, err := dialer.DialContext(ctx, network, addr)
return con, err
}
</s> add if net.ParseIP(host) != nil {
con, err := dialer.DialContext(ctx, network, addr)
return con, err
} </s> remove var firstErr error
firstErr = nil
for _, a := range addrs {
addr = fmt.Sprintf("%s:%s", a.String(), port)
con, err := dialer.DialContext(ctx, network, addr)
if err != nil {
if firstErr == nil {
firstErr = err
</s> add var firstErr error
firstErr = nil
for _, a := range addrs {
addr = fmt.Sprintf("%s:%s", a.String(), port)
con, err := dialer.DialContext(ctx, network, addr)
if err != nil {
if firstErr == nil {
firstErr = err
}
continue | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c4e67690f4fcceb055cbea73610b5974855db96f | dnsfilter/dnsfilter.go |
dialer := &net.Dialer{
Timeout: time.Minute * 5,
} | <mask> if err != nil {
<mask> return nil, err
<mask> }
<mask>
<mask> dialer := &net.Dialer{
<mask> Timeout: time.Minute * 5,
<mask> }
<mask>
<mask> if net.ParseIP(host) != nil {
<mask> con, err := dialer.DialContext(ctx, network, addr)
<mask> return con, err
<mask> }
</s> * dnsfilter: don't use global variable for custom resolver function </s> remove if net.ParseIP(host) != nil {
con, err := dialer.DialContext(ctx, network, addr)
return con, err
}
</s> add if net.ParseIP(host) != nil {
con, err := dialer.DialContext(ctx, network, addr)
return con, err
} </s> remove host, port, err := net.SplitHostPort(addr)
if err != nil {
return nil, err
}
</s> add host, port, err := net.SplitHostPort(addr)
if err != nil {
return nil, err
} </s> remove var firstErr error
firstErr = nil
for _, a := range addrs {
addr = fmt.Sprintf("%s:%s", a.String(), port)
con, err := dialer.DialContext(ctx, network, addr)
if err != nil {
if firstErr == nil {
firstErr = err
</s> add var firstErr error
firstErr = nil
for _, a := range addrs {
addr = fmt.Sprintf("%s:%s", a.String(), port)
con, err := dialer.DialContext(ctx, network, addr)
if err != nil {
if firstErr == nil {
firstErr = err
}
continue </s> remove continue
</s> add return con, err </s> remove r := upstream.NewResolver(resolverAddr, 30*time.Second)
addrs, e := r.LookupIPAddr(ctx, host)
log.Tracef("LookupIPAddr: %s: %v", host, addrs)
if e != nil {
return nil, e
}
</s> add r := upstream.NewResolver(resolverAddr, 30*time.Second)
addrs, e := r.LookupIPAddr(ctx, host)
log.Tracef("LookupIPAddr: %s: %v", host, addrs)
if e != nil {
return nil, e
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c4e67690f4fcceb055cbea73610b5974855db96f | dnsfilter/dnsfilter.go |
if net.ParseIP(host) != nil {
con, err := dialer.DialContext(ctx, network, addr)
return con, err
} | <mask> dialer := &net.Dialer{
<mask> Timeout: time.Minute * 5,
<mask> }
<mask>
<mask> if net.ParseIP(host) != nil {
<mask> con, err := dialer.DialContext(ctx, network, addr)
<mask> return con, err
<mask> }
<mask>
<mask> r := upstream.NewResolver(resolverAddr, 30*time.Second)
<mask> addrs, e := r.LookupIPAddr(ctx, host)
<mask> log.Tracef("LookupIPAddr: %s: %v", host, addrs)
<mask> if e != nil {
</s> * dnsfilter: don't use global variable for custom resolver function </s> remove r := upstream.NewResolver(resolverAddr, 30*time.Second)
addrs, e := r.LookupIPAddr(ctx, host)
log.Tracef("LookupIPAddr: %s: %v", host, addrs)
if e != nil {
return nil, e
}
</s> add r := upstream.NewResolver(resolverAddr, 30*time.Second)
addrs, e := r.LookupIPAddr(ctx, host)
log.Tracef("LookupIPAddr: %s: %v", host, addrs)
if e != nil {
return nil, e
} </s> remove dialer := &net.Dialer{
Timeout: time.Minute * 5,
}
</s> add dialer := &net.Dialer{
Timeout: time.Minute * 5,
} </s> remove host, port, err := net.SplitHostPort(addr)
if err != nil {
return nil, err
}
</s> add host, port, err := net.SplitHostPort(addr)
if err != nil {
return nil, err
} </s> remove var firstErr error
firstErr = nil
for _, a := range addrs {
addr = fmt.Sprintf("%s:%s", a.String(), port)
con, err := dialer.DialContext(ctx, network, addr)
if err != nil {
if firstErr == nil {
firstErr = err
</s> add var firstErr error
firstErr = nil
for _, a := range addrs {
addr = fmt.Sprintf("%s:%s", a.String(), port)
con, err := dialer.DialContext(ctx, network, addr)
if err != nil {
if firstErr == nil {
firstErr = err
}
continue </s> remove continue
</s> add return con, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c4e67690f4fcceb055cbea73610b5974855db96f | dnsfilter/dnsfilter.go |
r := upstream.NewResolver(resolverAddr, 30*time.Second)
addrs, e := r.LookupIPAddr(ctx, host)
log.Tracef("LookupIPAddr: %s: %v", host, addrs)
if e != nil {
return nil, e
} | <mask> con, err := dialer.DialContext(ctx, network, addr)
<mask> return con, err
<mask> }
<mask>
<mask> r := upstream.NewResolver(resolverAddr, 30*time.Second)
<mask> addrs, e := r.LookupIPAddr(ctx, host)
<mask> log.Tracef("LookupIPAddr: %s: %v", host, addrs)
<mask> if e != nil {
<mask> return nil, e
<mask> }
<mask>
<mask> var firstErr error
<mask> firstErr = nil
<mask> for _, a := range addrs {
<mask> addr = fmt.Sprintf("%s:%s", a.String(), port)
</s> * dnsfilter: don't use global variable for custom resolver function </s> remove var firstErr error
firstErr = nil
for _, a := range addrs {
addr = fmt.Sprintf("%s:%s", a.String(), port)
con, err := dialer.DialContext(ctx, network, addr)
if err != nil {
if firstErr == nil {
firstErr = err
</s> add var firstErr error
firstErr = nil
for _, a := range addrs {
addr = fmt.Sprintf("%s:%s", a.String(), port)
con, err := dialer.DialContext(ctx, network, addr)
if err != nil {
if firstErr == nil {
firstErr = err
}
continue </s> remove if net.ParseIP(host) != nil {
con, err := dialer.DialContext(ctx, network, addr)
return con, err
}
</s> add if net.ParseIP(host) != nil {
con, err := dialer.DialContext(ctx, network, addr)
return con, err
} </s> remove dialer := &net.Dialer{
Timeout: time.Minute * 5,
}
</s> add dialer := &net.Dialer{
Timeout: time.Minute * 5,
} </s> remove host, port, err := net.SplitHostPort(addr)
if err != nil {
return nil, err
}
</s> add host, port, err := net.SplitHostPort(addr)
if err != nil {
return nil, err
} </s> remove continue
</s> add return con, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c4e67690f4fcceb055cbea73610b5974855db96f | dnsfilter/dnsfilter.go |
var firstErr error
firstErr = nil
for _, a := range addrs {
addr = fmt.Sprintf("%s:%s", a.String(), port)
con, err := dialer.DialContext(ctx, network, addr)
if err != nil {
if firstErr == nil {
firstErr = err
}
continue | <mask> if e != nil {
<mask> return nil, e
<mask> }
<mask>
<mask> var firstErr error
<mask> firstErr = nil
<mask> for _, a := range addrs {
<mask> addr = fmt.Sprintf("%s:%s", a.String(), port)
<mask> con, err := dialer.DialContext(ctx, network, addr)
<mask> if err != nil {
<mask> if firstErr == nil {
<mask> firstErr = err
<mask> }
<mask> continue
<mask> }
<mask> return con, err
<mask> }
</s> * dnsfilter: don't use global variable for custom resolver function </s> remove r := upstream.NewResolver(resolverAddr, 30*time.Second)
addrs, e := r.LookupIPAddr(ctx, host)
log.Tracef("LookupIPAddr: %s: %v", host, addrs)
if e != nil {
return nil, e
}
</s> add r := upstream.NewResolver(resolverAddr, 30*time.Second)
addrs, e := r.LookupIPAddr(ctx, host)
log.Tracef("LookupIPAddr: %s: %v", host, addrs)
if e != nil {
return nil, e
} </s> remove continue
</s> add return con, err </s> remove if net.ParseIP(host) != nil {
con, err := dialer.DialContext(ctx, network, addr)
return con, err
}
</s> add if net.ParseIP(host) != nil {
con, err := dialer.DialContext(ctx, network, addr)
return con, err
} </s> remove dialer := &net.Dialer{
Timeout: time.Minute * 5,
}
</s> add dialer := &net.Dialer{
Timeout: time.Minute * 5,
} </s> remove host, port, err := net.SplitHostPort(addr)
if err != nil {
return nil, err
}
</s> add host, port, err := net.SplitHostPort(addr)
if err != nil {
return nil, err
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c4e67690f4fcceb055cbea73610b5974855db96f | dnsfilter/dnsfilter.go |
return con, err | <mask> if err != nil {
<mask> if firstErr == nil {
<mask> firstErr = err
<mask> }
<mask> continue
<mask> }
<mask> return con, err
<mask> }
<mask> return nil, firstErr
<mask> }
</s> * dnsfilter: don't use global variable for custom resolver function </s> remove var firstErr error
firstErr = nil
for _, a := range addrs {
addr = fmt.Sprintf("%s:%s", a.String(), port)
con, err := dialer.DialContext(ctx, network, addr)
if err != nil {
if firstErr == nil {
firstErr = err
</s> add var firstErr error
firstErr = nil
for _, a := range addrs {
addr = fmt.Sprintf("%s:%s", a.String(), port)
con, err := dialer.DialContext(ctx, network, addr)
if err != nil {
if firstErr == nil {
firstErr = err
}
continue </s> remove dialer := &net.Dialer{
Timeout: time.Minute * 5,
}
</s> add dialer := &net.Dialer{
Timeout: time.Minute * 5,
} </s> remove r := upstream.NewResolver(resolverAddr, 30*time.Second)
addrs, e := r.LookupIPAddr(ctx, host)
log.Tracef("LookupIPAddr: %s: %v", host, addrs)
if e != nil {
return nil, e
}
</s> add r := upstream.NewResolver(resolverAddr, 30*time.Second)
addrs, e := r.LookupIPAddr(ctx, host)
log.Tracef("LookupIPAddr: %s: %v", host, addrs)
if e != nil {
return nil, e
} </s> remove return con, err
</s> add return nil, firstErr </s> remove if net.ParseIP(host) != nil {
con, err := dialer.DialContext(ctx, network, addr)
return con, err
}
</s> add if net.ParseIP(host) != nil {
con, err := dialer.DialContext(ctx, network, addr)
return con, err
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c4e67690f4fcceb055cbea73610b5974855db96f | dnsfilter/dnsfilter.go |
return nil, firstErr | <mask> firstErr = err
<mask> }
<mask> continue
<mask> }
<mask> return con, err
<mask> }
<mask> return nil, firstErr
<mask> }
<mask>
<mask> // New creates properly initialized DNS Filter that is ready to be used
</s> * dnsfilter: don't use global variable for custom resolver function </s> remove return nil, firstErr
</s> add </s> remove continue
</s> add return con, err </s> remove var firstErr error
firstErr = nil
for _, a := range addrs {
addr = fmt.Sprintf("%s:%s", a.String(), port)
con, err := dialer.DialContext(ctx, network, addr)
if err != nil {
if firstErr == nil {
firstErr = err
</s> add var firstErr error
firstErr = nil
for _, a := range addrs {
addr = fmt.Sprintf("%s:%s", a.String(), port)
con, err := dialer.DialContext(ctx, network, addr)
if err != nil {
if firstErr == nil {
firstErr = err
}
continue </s> remove r := upstream.NewResolver(resolverAddr, 30*time.Second)
addrs, e := r.LookupIPAddr(ctx, host)
log.Tracef("LookupIPAddr: %s: %v", host, addrs)
if e != nil {
return nil, e
}
</s> add r := upstream.NewResolver(resolverAddr, 30*time.Second)
addrs, e := r.LookupIPAddr(ctx, host)
log.Tracef("LookupIPAddr: %s: %v", host, addrs)
if e != nil {
return nil, e
} </s> remove dialer := &net.Dialer{
Timeout: time.Minute * 5,
}
</s> add dialer := &net.Dialer{
Timeout: time.Minute * 5,
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c4e67690f4fcceb055cbea73610b5974855db96f | dnsfilter/dnsfilter.go |
<mask> continue
<mask> }
<mask> return con, err
<mask> }
<mask> return nil, firstErr
<mask> }
<mask>
<mask> // New creates properly initialized DNS Filter that is ready to be used
<mask> func New(c *Config) *Dnsfilter {
<mask> d := new(Dnsfilter)
</s> * dnsfilter: don't use global variable for custom resolver function </s> remove return con, err
</s> add return nil, firstErr </s> remove continue
</s> add return con, err </s> remove var firstErr error
firstErr = nil
for _, a := range addrs {
addr = fmt.Sprintf("%s:%s", a.String(), port)
con, err := dialer.DialContext(ctx, network, addr)
if err != nil {
if firstErr == nil {
firstErr = err
</s> add var firstErr error
firstErr = nil
for _, a := range addrs {
addr = fmt.Sprintf("%s:%s", a.String(), port)
con, err := dialer.DialContext(ctx, network, addr)
if err != nil {
if firstErr == nil {
firstErr = err
}
continue </s> remove dialer := &net.Dialer{
Timeout: time.Minute * 5,
}
</s> add dialer := &net.Dialer{
Timeout: time.Minute * 5,
} </s> remove host, port, err := net.SplitHostPort(addr)
if err != nil {
return nil, err
}
</s> add host, port, err := net.SplitHostPort(addr)
if err != nil {
return nil, err
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c4e67690f4fcceb055cbea73610b5974855db96f | dnsfilter/dnsfilter.go | |
d.transport.DialContext = createCustomDialContext(c.ResolverAddress) | <mask> TLSHandshakeTimeout: 10 * time.Second,
<mask> ExpectContinueTimeout: 1 * time.Second,
<mask> }
<mask> if c != nil && len(c.ResolverAddress) != 0 {
<mask> resolverAddr = c.ResolverAddress
<mask> d.transport.DialContext = customDialContext
<mask> }
<mask> d.client = http.Client{
<mask> Transport: d.transport,
<mask> Timeout: defaultHTTPTimeout,
<mask> }
</s> * dnsfilter: don't use global variable for custom resolver function </s> remove dialer := &net.Dialer{
Timeout: time.Minute * 5,
}
</s> add dialer := &net.Dialer{
Timeout: time.Minute * 5,
} </s> remove if net.ParseIP(host) != nil {
con, err := dialer.DialContext(ctx, network, addr)
return con, err
}
</s> add if net.ParseIP(host) != nil {
con, err := dialer.DialContext(ctx, network, addr)
return con, err
} </s> remove var firstErr error
firstErr = nil
for _, a := range addrs {
addr = fmt.Sprintf("%s:%s", a.String(), port)
con, err := dialer.DialContext(ctx, network, addr)
if err != nil {
if firstErr == nil {
firstErr = err
</s> add var firstErr error
firstErr = nil
for _, a := range addrs {
addr = fmt.Sprintf("%s:%s", a.String(), port)
con, err := dialer.DialContext(ctx, network, addr)
if err != nil {
if firstErr == nil {
firstErr = err
}
continue </s> remove continue
</s> add return con, err </s> remove host, port, err := net.SplitHostPort(addr)
if err != nil {
return nil, err
}
</s> add host, port, err := net.SplitHostPort(addr)
if err != nil {
return nil, err
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c4e67690f4fcceb055cbea73610b5974855db96f | dnsfilter/dnsfilter.go |
<mask> - 1.11.x
<mask> - master
<mask> - tip
<mask>
<mask> node_js:
<mask> - lts/*
<mask>
<mask> os:
<mask> - linux
<mask> - osx
<mask>
<mask> before_install:
</s> Travis -- fix build on OSX, simplify travis and get rid of yarn </s> remove "build-dev": "NODE_ENV=development webpack --config webpack.dev.js",
"watch": "NODE_ENV=development webpack --config webpack.dev.js --watch",
"build-prod": "NODE_ENV=production webpack --config webpack.prod.js",
</s> add "build-dev": "NODE_ENV=development ./node_modules/.bin/webpack --config webpack.dev.js",
"watch": "NODE_ENV=development ./node_modules/.bin/webpack --config webpack.dev.js --watch",
"build-prod": "NODE_ENV=production ./node_modules/.bin/webpack --config webpack.prod.js", </s> remove yarn --cwd client install
yarn --cwd client run build-prod
</s> add cd client; npm install
cd client; npm run build-prod </s> remove before_install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl -o- -L https://yarnpkg.com/install.sh | bash; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install yarn; fi
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c4fefa10b0b418f7fd97d6103f8621baf2e40bf8 | .travis.yml | |
<mask> os:
<mask> - linux
<mask> - osx
<mask>
<mask> before_install:
<mask> - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl -o- -L https://yarnpkg.com/install.sh | bash; fi
<mask> - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"; fi
<mask> - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install yarn; fi
<mask>
<mask> script:
<mask> - cd dnsfilter && go get -d -t . && go test
<mask> - cd ../coredns_plugin && go get -d -t . && go test
<mask> - cd .. && make
<mask>
</s> Travis -- fix build on OSX, simplify travis and get rid of yarn </s> remove "build-dev": "NODE_ENV=development webpack --config webpack.dev.js",
"watch": "NODE_ENV=development webpack --config webpack.dev.js --watch",
"build-prod": "NODE_ENV=production webpack --config webpack.prod.js",
</s> add "build-dev": "NODE_ENV=development ./node_modules/.bin/webpack --config webpack.dev.js",
"watch": "NODE_ENV=development ./node_modules/.bin/webpack --config webpack.dev.js --watch",
"build-prod": "NODE_ENV=production ./node_modules/.bin/webpack --config webpack.prod.js", </s> remove yarn --cwd client install
yarn --cwd client run build-prod
</s> add cd client; npm install
cd client; npm run build-prod </s> remove node_js:
- lts/*
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c4fefa10b0b418f7fd97d6103f8621baf2e40bf8 | .travis.yml | |
cd client; npm install
cd client; npm run build-prod | <mask>
<mask> build: AdguardDNS coredns
<mask>
<mask> $(STATIC):
<mask> yarn --cwd client install
<mask> yarn --cwd client run build-prod
<mask>
<mask> AdguardDNS: $(STATIC) *.go
<mask> echo mkfile_dir = $(mkfile_dir)
<mask> go get -v -d .
<mask> GOOS=$(NATIVE_GOOS) GOARCH=$(NATIVE_GOARCH) go get -v github.com/gobuffalo/packr/...
</s> Travis -- fix build on OSX, simplify travis and get rid of yarn </s> remove "build-dev": "NODE_ENV=development webpack --config webpack.dev.js",
"watch": "NODE_ENV=development webpack --config webpack.dev.js --watch",
"build-prod": "NODE_ENV=production webpack --config webpack.prod.js",
</s> add "build-dev": "NODE_ENV=development ./node_modules/.bin/webpack --config webpack.dev.js",
"watch": "NODE_ENV=development ./node_modules/.bin/webpack --config webpack.dev.js --watch",
"build-prod": "NODE_ENV=production ./node_modules/.bin/webpack --config webpack.prod.js", </s> remove before_install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl -o- -L https://yarnpkg.com/install.sh | bash; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install yarn; fi
</s> add </s> remove node_js:
- lts/*
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c4fefa10b0b418f7fd97d6103f8621baf2e40bf8 | Makefile |
"build-dev": "NODE_ENV=development ./node_modules/.bin/webpack --config webpack.dev.js",
"watch": "NODE_ENV=development ./node_modules/.bin/webpack --config webpack.dev.js --watch",
"build-prod": "NODE_ENV=production ./node_modules/.bin/webpack --config webpack.prod.js", | <mask> "name": "dashboard",
<mask> "version": "0.1.0",
<mask> "private": true,
<mask> "scripts": {
<mask> "build-dev": "NODE_ENV=development webpack --config webpack.dev.js",
<mask> "watch": "NODE_ENV=development webpack --config webpack.dev.js --watch",
<mask> "build-prod": "NODE_ENV=production webpack --config webpack.prod.js",
<mask> "lint": "eslint frontend/"
<mask> },
<mask> "dependencies": {
<mask> "@nivo/line": "^0.42.1",
<mask> "axios": "^0.18.0",
</s> Travis -- fix build on OSX, simplify travis and get rid of yarn </s> remove yarn --cwd client install
yarn --cwd client run build-prod
</s> add cd client; npm install
cd client; npm run build-prod </s> remove before_install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl -o- -L https://yarnpkg.com/install.sh | bash; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install yarn; fi
</s> add </s> remove node_js:
- lts/*
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c4fefa10b0b418f7fd97d6103f8621baf2e40bf8 | client/package.json |
HandleDDR bool `yaml:"handle_ddr"` // Handle DDR requests | <mask> AAAADisabled bool `yaml:"aaaa_disabled"` // Respond with an empty answer to all AAAA requests
<mask> EnableDNSSEC bool `yaml:"enable_dnssec"` // Set AD 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> // IpsetList is the ipset configuration that allows AdGuard Home to add
<mask> // IP addresses of the specified domain names to an ipset list. Syntax:
<mask> //
<mask> // DOMAIN[,DOMAIN].../IPSET_NAME
</s> Pull request: dnsforward: ddr support
Merge in DNS/adguard-home from 4463-ddr-support-1 to master
Squashed commit of the following:
commit 74d8337a9d78e00a0b01301bbf92054fc58aff0d
Merge: 7882c56e ed449c61
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Apr 27 10:32:48 2022 +0200
Merge remote-tracking branch 'origin/master' into 4463-ddr-support-1
commit 7882c56eced204b99a0189c839f5b5ef56fcbfd8
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 13:29:16 2022 +0200
all: docs
commit 59593cf47f8db2131fb8a4a44ec3721de8f73567
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 13:06:49 2022 +0200
all: docs
commit 13bfe00d91b190a2538eeee642ce40abe031ecf2
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 12:58:48 2022 +0200
all: docs
commit a663b53d211483a717a480e24e120a201dc3d9da
Merge: 53122f6a 235316e0
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 12:33:07 2022 +0200
Merge remote-tracking branch 'origin/master' into 4463-ddr-support-1
commit 53122f6aac8e9ede69de833e367e006f4c5c75c0
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 12:30:56 2022 +0200
dnsforward: ddr support
commit 87083ded02c120e1fb3e54b885a1992efd8f780d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 11:51:06 2022 +0200
dnsforward: ddr support
commit 3dc711e0a9ba1a024e7d24527b2a690aa36413ce
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 11:39:59 2022 +0200
dnsforward: imp code
commit f63f6a9d65a96960ae2c06aeca2b32aef70d8f63
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 11:34:23 2022 +0200
dnsforward: ddr support
commit e64ffcdac8f9428e4c93a6dc99cc3f1bb090af35
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 11:22:20 2022 +0200
dnsforward: ddr support
commit 297460946bb1765137c7c3fe3e298cd574635287
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 11:08:59 2022 +0200
dnsforward: imp code
commit 61b4e2e0e06e212c31b7a9d1b09fab392ae6dbc4
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Apr 25 14:39:34 2022 +0200
dnsforward: ddr support
commit 7c2787e12eb67a02b41cbb4fe36a12671259f9c9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Apr 25 11:41:42 2022 +0200
all: docs
commit 29c2c872843f6d006e6a98144a52e23a4cbe7be9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Apr 25 11:26:07 2022 +0200
dnsforward: ddr support
commit 2d4ba0c4ce4fbbf3d99da8dd92349da2ec9cff13
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Apr 25 11:03:34 2022 +0200
dnsforward: ddr support
commit 0efb5b5cd55bcba3dfae35e80209277f0643a87e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Sun Apr 24 13:07:25 2022 +0200
dnsforward: imp code
commit 884381ef04029d5d743834555cb6601d891c2d25
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Sun Apr 24 12:56:41 2022 +0200
dnsforward: imp code
commit 41231f24e83a9690d36546e83fd61ddd709050ed
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Apr 22 16:05:47 2022 +0200
dnsforward: ddr support
commit 9d9da3f479efa5d5609f9b1e6b0d1a93fc253b9f
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Apr 22 13:46:29 2022 +0200
all: ddr support
commit b225363df143d599e9acbf1a6b0bf6d00044dd47
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Apr 22 13:38:27 2022 +0200
dnsforward: imp code
... and 10 more commits </s> remove // used for ClientID checking.
</s> add // used for ClientID checking and Discovery of Designated Resolvers (DDR). | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c4ff80fd3aa070b75bcfc02b0aaf6b5670fddefe | internal/dnsforward/config.go |
// used for ClientID checking and Discovery of Designated Resolvers (DDR). | <mask> CertificateChainData []byte `yaml:"-" json:"-"`
<mask> PrivateKeyData []byte `yaml:"-" json:"-"`
<mask>
<mask> // ServerName is the hostname of the server. Currently, it is only being
<mask> // used for ClientID checking.
<mask> ServerName string `yaml:"-" json:"-"`
<mask>
<mask> cert tls.Certificate
<mask> // DNS names from certificate (SAN) or CN value from Subject
<mask> dnsNames []string
</s> Pull request: dnsforward: ddr support
Merge in DNS/adguard-home from 4463-ddr-support-1 to master
Squashed commit of the following:
commit 74d8337a9d78e00a0b01301bbf92054fc58aff0d
Merge: 7882c56e ed449c61
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Apr 27 10:32:48 2022 +0200
Merge remote-tracking branch 'origin/master' into 4463-ddr-support-1
commit 7882c56eced204b99a0189c839f5b5ef56fcbfd8
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 13:29:16 2022 +0200
all: docs
commit 59593cf47f8db2131fb8a4a44ec3721de8f73567
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 13:06:49 2022 +0200
all: docs
commit 13bfe00d91b190a2538eeee642ce40abe031ecf2
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 12:58:48 2022 +0200
all: docs
commit a663b53d211483a717a480e24e120a201dc3d9da
Merge: 53122f6a 235316e0
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 12:33:07 2022 +0200
Merge remote-tracking branch 'origin/master' into 4463-ddr-support-1
commit 53122f6aac8e9ede69de833e367e006f4c5c75c0
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 12:30:56 2022 +0200
dnsforward: ddr support
commit 87083ded02c120e1fb3e54b885a1992efd8f780d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 11:51:06 2022 +0200
dnsforward: ddr support
commit 3dc711e0a9ba1a024e7d24527b2a690aa36413ce
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 11:39:59 2022 +0200
dnsforward: imp code
commit f63f6a9d65a96960ae2c06aeca2b32aef70d8f63
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 11:34:23 2022 +0200
dnsforward: ddr support
commit e64ffcdac8f9428e4c93a6dc99cc3f1bb090af35
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 11:22:20 2022 +0200
dnsforward: ddr support
commit 297460946bb1765137c7c3fe3e298cd574635287
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 11:08:59 2022 +0200
dnsforward: imp code
commit 61b4e2e0e06e212c31b7a9d1b09fab392ae6dbc4
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Apr 25 14:39:34 2022 +0200
dnsforward: ddr support
commit 7c2787e12eb67a02b41cbb4fe36a12671259f9c9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Apr 25 11:41:42 2022 +0200
all: docs
commit 29c2c872843f6d006e6a98144a52e23a4cbe7be9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Apr 25 11:26:07 2022 +0200
dnsforward: ddr support
commit 2d4ba0c4ce4fbbf3d99da8dd92349da2ec9cff13
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Apr 25 11:03:34 2022 +0200
dnsforward: ddr support
commit 0efb5b5cd55bcba3dfae35e80209277f0643a87e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Sun Apr 24 13:07:25 2022 +0200
dnsforward: imp code
commit 884381ef04029d5d743834555cb6601d891c2d25
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Sun Apr 24 12:56:41 2022 +0200
dnsforward: imp code
commit 41231f24e83a9690d36546e83fd61ddd709050ed
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Apr 22 16:05:47 2022 +0200
dnsforward: ddr support
commit 9d9da3f479efa5d5609f9b1e6b0d1a93fc253b9f
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Apr 22 13:46:29 2022 +0200
all: ddr support
commit b225363df143d599e9acbf1a6b0bf6d00044dd47
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Apr 22 13:38:27 2022 +0200
dnsforward: imp code
... and 10 more commits | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c4ff80fd3aa070b75bcfc02b0aaf6b5670fddefe | internal/dnsforward/config.go |
// ddrHostFQDN is the FQDN used in Discovery of Designated Resolvers (DDR) requests.
// See https://www.ietf.org/archive/id/draft-ietf-add-ddr-06.html.
const ddrHostFQDN = "_dns.resolver.arpa."
| <mask> resultCodeError
<mask> )
<mask>
<mask> // handleDNSRequest filters the incoming DNS requests and writes them to the query log
<mask> func (s *Server) handleDNSRequest(_ *proxy.Proxy, d *proxy.DNSContext) error {
<mask> ctx := &dnsContext{
<mask> proxyCtx: d,
<mask> result: &filtering.Result{},
</s> Pull request: dnsforward: ddr support
Merge in DNS/adguard-home from 4463-ddr-support-1 to master
Squashed commit of the following:
commit 74d8337a9d78e00a0b01301bbf92054fc58aff0d
Merge: 7882c56e ed449c61
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Apr 27 10:32:48 2022 +0200
Merge remote-tracking branch 'origin/master' into 4463-ddr-support-1
commit 7882c56eced204b99a0189c839f5b5ef56fcbfd8
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 13:29:16 2022 +0200
all: docs
commit 59593cf47f8db2131fb8a4a44ec3721de8f73567
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 13:06:49 2022 +0200
all: docs
commit 13bfe00d91b190a2538eeee642ce40abe031ecf2
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 12:58:48 2022 +0200
all: docs
commit a663b53d211483a717a480e24e120a201dc3d9da
Merge: 53122f6a 235316e0
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 12:33:07 2022 +0200
Merge remote-tracking branch 'origin/master' into 4463-ddr-support-1
commit 53122f6aac8e9ede69de833e367e006f4c5c75c0
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 12:30:56 2022 +0200
dnsforward: ddr support
commit 87083ded02c120e1fb3e54b885a1992efd8f780d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 11:51:06 2022 +0200
dnsforward: ddr support
commit 3dc711e0a9ba1a024e7d24527b2a690aa36413ce
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 11:39:59 2022 +0200
dnsforward: imp code
commit f63f6a9d65a96960ae2c06aeca2b32aef70d8f63
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 11:34:23 2022 +0200
dnsforward: ddr support
commit e64ffcdac8f9428e4c93a6dc99cc3f1bb090af35
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 11:22:20 2022 +0200
dnsforward: ddr support
commit 297460946bb1765137c7c3fe3e298cd574635287
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 11:08:59 2022 +0200
dnsforward: imp code
commit 61b4e2e0e06e212c31b7a9d1b09fab392ae6dbc4
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Apr 25 14:39:34 2022 +0200
dnsforward: ddr support
commit 7c2787e12eb67a02b41cbb4fe36a12671259f9c9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Apr 25 11:41:42 2022 +0200
all: docs
commit 29c2c872843f6d006e6a98144a52e23a4cbe7be9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Apr 25 11:26:07 2022 +0200
dnsforward: ddr support
commit 2d4ba0c4ce4fbbf3d99da8dd92349da2ec9cff13
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Apr 25 11:03:34 2022 +0200
dnsforward: ddr support
commit 0efb5b5cd55bcba3dfae35e80209277f0643a87e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Sun Apr 24 13:07:25 2022 +0200
dnsforward: imp code
commit 884381ef04029d5d743834555cb6601d891c2d25
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Sun Apr 24 12:56:41 2022 +0200
dnsforward: imp code
commit 41231f24e83a9690d36546e83fd61ddd709050ed
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Apr 22 16:05:47 2022 +0200
dnsforward: ddr support
commit 9d9da3f479efa5d5609f9b1e6b0d1a93fc253b9f
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Apr 22 13:46:29 2022 +0200
all: ddr support
commit b225363df143d599e9acbf1a6b0bf6d00044dd47
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Apr 22 13:38:27 2022 +0200
dnsforward: imp code
... and 10 more commits </s> remove // used for ClientID checking.
</s> add // used for ClientID checking and Discovery of Designated Resolvers (DDR). | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c4ff80fd3aa070b75bcfc02b0aaf6b5670fddefe | internal/dnsforward/dns.go |
s.processDDRQuery, | <mask> mods := []modProcessFunc{
<mask> s.processRecursion,
<mask> s.processInitial,
<mask> s.processDetermineLocal,
<mask> s.processInternalHosts,
<mask> s.processRestrictLocal,
<mask> s.processInternalIPAddrs,
</s> Pull request: dnsforward: ddr support
Merge in DNS/adguard-home from 4463-ddr-support-1 to master
Squashed commit of the following:
commit 74d8337a9d78e00a0b01301bbf92054fc58aff0d
Merge: 7882c56e ed449c61
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Apr 27 10:32:48 2022 +0200
Merge remote-tracking branch 'origin/master' into 4463-ddr-support-1
commit 7882c56eced204b99a0189c839f5b5ef56fcbfd8
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 13:29:16 2022 +0200
all: docs
commit 59593cf47f8db2131fb8a4a44ec3721de8f73567
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 13:06:49 2022 +0200
all: docs
commit 13bfe00d91b190a2538eeee642ce40abe031ecf2
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 12:58:48 2022 +0200
all: docs
commit a663b53d211483a717a480e24e120a201dc3d9da
Merge: 53122f6a 235316e0
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 12:33:07 2022 +0200
Merge remote-tracking branch 'origin/master' into 4463-ddr-support-1
commit 53122f6aac8e9ede69de833e367e006f4c5c75c0
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 12:30:56 2022 +0200
dnsforward: ddr support
commit 87083ded02c120e1fb3e54b885a1992efd8f780d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 11:51:06 2022 +0200
dnsforward: ddr support
commit 3dc711e0a9ba1a024e7d24527b2a690aa36413ce
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 11:39:59 2022 +0200
dnsforward: imp code
commit f63f6a9d65a96960ae2c06aeca2b32aef70d8f63
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 11:34:23 2022 +0200
dnsforward: ddr support
commit e64ffcdac8f9428e4c93a6dc99cc3f1bb090af35
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 11:22:20 2022 +0200
dnsforward: ddr support
commit 297460946bb1765137c7c3fe3e298cd574635287
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 11:08:59 2022 +0200
dnsforward: imp code
commit 61b4e2e0e06e212c31b7a9d1b09fab392ae6dbc4
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Apr 25 14:39:34 2022 +0200
dnsforward: ddr support
commit 7c2787e12eb67a02b41cbb4fe36a12671259f9c9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Apr 25 11:41:42 2022 +0200
all: docs
commit 29c2c872843f6d006e6a98144a52e23a4cbe7be9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Apr 25 11:26:07 2022 +0200
dnsforward: ddr support
commit 2d4ba0c4ce4fbbf3d99da8dd92349da2ec9cff13
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Apr 25 11:03:34 2022 +0200
dnsforward: ddr support
commit 0efb5b5cd55bcba3dfae35e80209277f0643a87e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Sun Apr 24 13:07:25 2022 +0200
dnsforward: imp code
commit 884381ef04029d5d743834555cb6601d891c2d25
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Sun Apr 24 12:56:41 2022 +0200
dnsforward: imp code
commit 41231f24e83a9690d36546e83fd61ddd709050ed
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Apr 22 16:05:47 2022 +0200
dnsforward: ddr support
commit 9d9da3f479efa5d5609f9b1e6b0d1a93fc253b9f
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Apr 22 13:46:29 2022 +0200
all: ddr support
commit b225363df143d599e9acbf1a6b0bf6d00044dd47
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Apr 22 13:38:27 2022 +0200
dnsforward: imp code
... and 10 more commits </s> remove // used for ClientID checking.
</s> add // used for ClientID checking and Discovery of Designated Resolvers (DDR). | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c4ff80fd3aa070b75bcfc02b0aaf6b5670fddefe | internal/dnsforward/dns.go |
HandleDDR: true, | <mask> RefuseAny: true,
<mask> AllServers: false,
<mask> FastestTimeout: timeutil.Duration{
<mask> Duration: fastip.DefaultPingWaitTimeout,
<mask> },
<mask>
</s> Pull request: dnsforward: ddr support
Merge in DNS/adguard-home from 4463-ddr-support-1 to master
Squashed commit of the following:
commit 74d8337a9d78e00a0b01301bbf92054fc58aff0d
Merge: 7882c56e ed449c61
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Wed Apr 27 10:32:48 2022 +0200
Merge remote-tracking branch 'origin/master' into 4463-ddr-support-1
commit 7882c56eced204b99a0189c839f5b5ef56fcbfd8
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 13:29:16 2022 +0200
all: docs
commit 59593cf47f8db2131fb8a4a44ec3721de8f73567
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 13:06:49 2022 +0200
all: docs
commit 13bfe00d91b190a2538eeee642ce40abe031ecf2
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 12:58:48 2022 +0200
all: docs
commit a663b53d211483a717a480e24e120a201dc3d9da
Merge: 53122f6a 235316e0
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 12:33:07 2022 +0200
Merge remote-tracking branch 'origin/master' into 4463-ddr-support-1
commit 53122f6aac8e9ede69de833e367e006f4c5c75c0
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 12:30:56 2022 +0200
dnsforward: ddr support
commit 87083ded02c120e1fb3e54b885a1992efd8f780d
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 11:51:06 2022 +0200
dnsforward: ddr support
commit 3dc711e0a9ba1a024e7d24527b2a690aa36413ce
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 11:39:59 2022 +0200
dnsforward: imp code
commit f63f6a9d65a96960ae2c06aeca2b32aef70d8f63
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 11:34:23 2022 +0200
dnsforward: ddr support
commit e64ffcdac8f9428e4c93a6dc99cc3f1bb090af35
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 11:22:20 2022 +0200
dnsforward: ddr support
commit 297460946bb1765137c7c3fe3e298cd574635287
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Tue Apr 26 11:08:59 2022 +0200
dnsforward: imp code
commit 61b4e2e0e06e212c31b7a9d1b09fab392ae6dbc4
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Apr 25 14:39:34 2022 +0200
dnsforward: ddr support
commit 7c2787e12eb67a02b41cbb4fe36a12671259f9c9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Apr 25 11:41:42 2022 +0200
all: docs
commit 29c2c872843f6d006e6a98144a52e23a4cbe7be9
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Apr 25 11:26:07 2022 +0200
dnsforward: ddr support
commit 2d4ba0c4ce4fbbf3d99da8dd92349da2ec9cff13
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Mon Apr 25 11:03:34 2022 +0200
dnsforward: ddr support
commit 0efb5b5cd55bcba3dfae35e80209277f0643a87e
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Sun Apr 24 13:07:25 2022 +0200
dnsforward: imp code
commit 884381ef04029d5d743834555cb6601d891c2d25
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Sun Apr 24 12:56:41 2022 +0200
dnsforward: imp code
commit 41231f24e83a9690d36546e83fd61ddd709050ed
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Apr 22 16:05:47 2022 +0200
dnsforward: ddr support
commit 9d9da3f479efa5d5609f9b1e6b0d1a93fc253b9f
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Apr 22 13:46:29 2022 +0200
all: ddr support
commit b225363df143d599e9acbf1a6b0bf6d00044dd47
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date: Fri Apr 22 13:38:27 2022 +0200
dnsforward: imp code
... and 10 more commits </s> remove // used for ClientID checking.
</s> add // used for ClientID checking and Discovery of Designated Resolvers (DDR). | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c4ff80fd3aa070b75bcfc02b0aaf6b5670fddefe | internal/home/config.go |
"net/netip" | <mask> "fmt"
<mask> "net/http"
<mask> "os"
<mask> "strings"
<mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghalg"
</s> Pull request: 4898-redirect-https
Merge in DNS/adguard-home from 4898-redirect-https to master
Updates #4898.
Updates #4927.
Squashed commit of the following:
commit bc41b6cae7ede0f1235e3956ab49204af1c9f38d
Merge: 815e2991 ac7634da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 13:02:23 2022 +0300
Merge branch 'master' into 4898-redirect-https
commit 815e299137224fc3c7fd46924d7b936515b95d67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 12:58:28 2022 +0300
home: imp ip addr detection
commit 9d4ecd9ab0e13ef6c19c3b923363bff43394ea4c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 17:23:41 2022 +0300
home: imp cyclo
commit 86c47b68fe6e3916cec97eee5d34e3e6c18e4892
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 15:06:05 2022 +0300
all: imp text
commit bcc25697b551668d1dab53a874e716fcadd83f09
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 11:47:57 2022 +0300
home: fix test
commit bb51a74cb82eeaa977821fa7314810c7b8be55cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Oct 30 23:23:40 2022 +0300
home: imp code
commit 38522330691baf8475a59ed4f40b1d45363df1e3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 28 17:00:50 2022 +0300
home: imp code
commit 7284f7288feb7491560f0f5d2754044c7a9f603a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:42:57 2022 +0300
all: log changes
commit 540efcb013e15294b98efe581323f75ceefc8f5a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:24:21 2022 +0300
home: imp tls </s> remove opts := x509.VerifyOptions{
DNSName: serverName,
Roots: Context.tlsRoots,
</s> add for _, name := range cert.DNSNames {
if _, err := netip.ParseAddr(name); err == nil {
return true
} </s> remove return nil
</s> add return parsedCerts, true, err </s> remove if mainCert != nil {
status.Subject = mainCert.Subject.String()
status.Issuer = mainCert.Issuer.String()
status.NotAfter = mainCert.NotAfter
status.NotBefore = mainCert.NotBefore
status.DNSNames = mainCert.DNSNames
</s> add log.Info("tls: number of certs: %d", len(parsedCerts))
if !certHasIP(parsedCerts[0]) {
err = errors.Error(`certificate has no IP addresses` +
`, this may cause issues with DNS-over-TLS clients`) </s> remove // Let self-signed certs through and don't return this error.
status.WarningValidation = fmt.Sprintf("certificate does not verify: %s", err)
} else {
status.ValidChain = true
</s> add return nil, false, err | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls.go |
if status.ValidCert && status.ValidKey && status.ValidPair {
// Do not return warnings since those aren't critical.
err = nil
} | <mask> func loadTLSConf(tlsConf *tlsConfigSettings, status *tlsConfigStatus) (err error) {
<mask> defer func() {
<mask> if err != nil {
<mask> status.WarningValidation = err.Error()
<mask> }
<mask> }()
<mask>
<mask> tlsConf.CertificateChainData = []byte(tlsConf.CertificateChain)
</s> Pull request: 4898-redirect-https
Merge in DNS/adguard-home from 4898-redirect-https to master
Updates #4898.
Updates #4927.
Squashed commit of the following:
commit bc41b6cae7ede0f1235e3956ab49204af1c9f38d
Merge: 815e2991 ac7634da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 13:02:23 2022 +0300
Merge branch 'master' into 4898-redirect-https
commit 815e299137224fc3c7fd46924d7b936515b95d67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 12:58:28 2022 +0300
home: imp ip addr detection
commit 9d4ecd9ab0e13ef6c19c3b923363bff43394ea4c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 17:23:41 2022 +0300
home: imp cyclo
commit 86c47b68fe6e3916cec97eee5d34e3e6c18e4892
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 15:06:05 2022 +0300
all: imp text
commit bcc25697b551668d1dab53a874e716fcadd83f09
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 11:47:57 2022 +0300
home: fix test
commit bb51a74cb82eeaa977821fa7314810c7b8be55cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Oct 30 23:23:40 2022 +0300
home: imp code
commit 38522330691baf8475a59ed4f40b1d45363df1e3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 28 17:00:50 2022 +0300
home: imp code
commit 7284f7288feb7491560f0f5d2754044c7a9f603a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:42:57 2022 +0300
all: log changes
commit 540efcb013e15294b98efe581323f75ceefc8f5a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:24:21 2022 +0300
home: imp tls </s> remove // validateCertChain validates the certificate chain and sets data in status.
// The returned error is also set in status.WarningValidation.
func validateCertChain(status *tlsConfigStatus, certChain []byte, serverName string) (err error) {
defer func() {
if err != nil {
status.WarningValidation = err.Error()
}
}()
log.Debug("tls: got certificate chain: %d bytes", len(certChain))
var certs []*pem.Block
pemblock := certChain
for {
var decoded *pem.Block
decoded, pemblock = pem.Decode(pemblock)
if decoded == nil {
break
}
</s> add // validateCertChain verifies certs using the first as the main one and others
// as intermediate. srvName stands for the expected DNS name.
func validateCertChain(certs []*x509.Certificate, srvName string) (err error) {
main, others := certs[0], certs[1:] </s> remove // validatePKey validates the private key and sets data in status. The returned
// error is also set in status.WarningValidation.
func validatePKey(status *tlsConfigStatus, pkey []byte) (err error) {
defer func() {
if err != nil {
status.WarningValidation = err.Error()
}
}()
</s> add // validatePKey validates the private key, returning its type. It returns an
// empty string if error occurs.
func validatePKey(pkey []byte) (keyType string, err error) { </s> remove defer func() {
// Capitalize the warning for the UI. Assume that warnings are all
// ASCII-only.
//
// TODO(a.garipov): Figure out a better way to do this. Perhaps a
// custom string or error type.
if w := status.WarningValidation; w != "" {
status.WarningValidation = strings.ToUpper(w[:1]) + w[1:]
}
}()
</s> add </s> remove _, err = tls.X509KeyPair(certChain, pkey)
if err != nil {
err = fmt.Errorf("certificate-key pair: %w", err)
status.WarningValidation = err.Error()
return err
</s> add _, pairErr := tls.X509KeyPair(certChain, pkey)
if pairErr != nil {
return fmt.Errorf("certificate-key pair: %w", pairErr) </s> remove // Let self-signed certs through and don't return this error.
status.WarningValidation = fmt.Sprintf("certificate does not verify: %s", err)
} else {
status.ValidChain = true
</s> add return nil, false, err | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls.go |
// Set status.ValidCert to true to signal the frontend that the
// certificate opens successfully while the private key can't be opened. | <mask> if err != nil {
<mask> return fmt.Errorf("reading cert file: %w", err)
<mask> }
<mask>
<mask> status.ValidCert = true
<mask> }
<mask>
<mask> if tlsConf.PrivateKeyPath != "" {
<mask> if tlsConf.PrivateKey != "" {
</s> Pull request: 4898-redirect-https
Merge in DNS/adguard-home from 4898-redirect-https to master
Updates #4898.
Updates #4927.
Squashed commit of the following:
commit bc41b6cae7ede0f1235e3956ab49204af1c9f38d
Merge: 815e2991 ac7634da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 13:02:23 2022 +0300
Merge branch 'master' into 4898-redirect-https
commit 815e299137224fc3c7fd46924d7b936515b95d67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 12:58:28 2022 +0300
home: imp ip addr detection
commit 9d4ecd9ab0e13ef6c19c3b923363bff43394ea4c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 17:23:41 2022 +0300
home: imp cyclo
commit 86c47b68fe6e3916cec97eee5d34e3e6c18e4892
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 15:06:05 2022 +0300
all: imp text
commit bcc25697b551668d1dab53a874e716fcadd83f09
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 11:47:57 2022 +0300
home: fix test
commit bb51a74cb82eeaa977821fa7314810c7b8be55cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Oct 30 23:23:40 2022 +0300
home: imp code
commit 38522330691baf8475a59ed4f40b1d45363df1e3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 28 17:00:50 2022 +0300
home: imp code
commit 7284f7288feb7491560f0f5d2754044c7a9f603a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:42:57 2022 +0300
all: log changes
commit 540efcb013e15294b98efe581323f75ceefc8f5a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:24:21 2022 +0300
home: imp tls </s> remove return err
</s> add return fmt.Errorf("certificate does not verify: %w", err) </s> remove _, err = tls.X509KeyPair(certChain, pkey)
if err != nil {
err = fmt.Errorf("certificate-key pair: %w", err)
status.WarningValidation = err.Error()
return err
</s> add _, pairErr := tls.X509KeyPair(certChain, pkey)
if pairErr != nil {
return fmt.Errorf("certificate-key pair: %w", pairErr) </s> remove status.ValidCert = true
</s> add return nil
}
// certHasIP returns true if cert has at least a single IP address either in its
// DNS names or in the IP addresses section.
func certHasIP(cert *x509.Certificate) (ok bool) {
if len(cert.IPAddresses) > 0 {
return true
} </s> remove _, keyType, err := parsePrivateKey(key.Bytes)
</s> add _, keyType, err = parsePrivateKey(key.Bytes) </s> remove if decoded.Type == "CERTIFICATE" {
certs = append(certs, decoded)
}
</s> add pool := x509.NewCertPool()
for _, cert := range others {
log.Info("tls: got an intermediate cert")
pool.AddCert(cert) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls.go |
// validateCertChain verifies certs using the first as the main one and others
// as intermediate. srvName stands for the expected DNS name.
func validateCertChain(certs []*x509.Certificate, srvName string) (err error) {
main, others := certs[0], certs[1:] | <mask>
<mask> return nil
<mask> }
<mask>
<mask> // validateCertChain validates the certificate chain and sets data in status.
<mask> // The returned error is also set in status.WarningValidation.
<mask> func validateCertChain(status *tlsConfigStatus, certChain []byte, serverName string) (err error) {
<mask> defer func() {
<mask> if err != nil {
<mask> status.WarningValidation = err.Error()
<mask> }
<mask> }()
<mask>
<mask> log.Debug("tls: got certificate chain: %d bytes", len(certChain))
<mask>
<mask> var certs []*pem.Block
<mask> pemblock := certChain
<mask> for {
<mask> var decoded *pem.Block
<mask> decoded, pemblock = pem.Decode(pemblock)
<mask> if decoded == nil {
<mask> break
<mask> }
<mask>
<mask> if decoded.Type == "CERTIFICATE" {
<mask> certs = append(certs, decoded)
<mask> }
<mask> }
</s> Pull request: 4898-redirect-https
Merge in DNS/adguard-home from 4898-redirect-https to master
Updates #4898.
Updates #4927.
Squashed commit of the following:
commit bc41b6cae7ede0f1235e3956ab49204af1c9f38d
Merge: 815e2991 ac7634da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 13:02:23 2022 +0300
Merge branch 'master' into 4898-redirect-https
commit 815e299137224fc3c7fd46924d7b936515b95d67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 12:58:28 2022 +0300
home: imp ip addr detection
commit 9d4ecd9ab0e13ef6c19c3b923363bff43394ea4c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 17:23:41 2022 +0300
home: imp cyclo
commit 86c47b68fe6e3916cec97eee5d34e3e6c18e4892
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 15:06:05 2022 +0300
all: imp text
commit bcc25697b551668d1dab53a874e716fcadd83f09
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 11:47:57 2022 +0300
home: fix test
commit bb51a74cb82eeaa977821fa7314810c7b8be55cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Oct 30 23:23:40 2022 +0300
home: imp code
commit 38522330691baf8475a59ed4f40b1d45363df1e3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 28 17:00:50 2022 +0300
home: imp code
commit 7284f7288feb7491560f0f5d2754044c7a9f603a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:42:57 2022 +0300
all: log changes
commit 540efcb013e15294b98efe581323f75ceefc8f5a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:24:21 2022 +0300
home: imp tls </s> remove // validatePKey validates the private key and sets data in status. The returned
// error is also set in status.WarningValidation.
func validatePKey(status *tlsConfigStatus, pkey []byte) (err error) {
defer func() {
if err != nil {
status.WarningValidation = err.Error()
}
}()
</s> add // validatePKey validates the private key, returning its type. It returns an
// empty string if error occurs.
func validatePKey(pkey []byte) (keyType string, err error) { </s> remove opts.Intermediates = pool
</s> add var certs []*pem.Block
for decoded, pemblock := pem.Decode(chain); decoded != nil; {
if decoded.Type == "CERTIFICATE" {
certs = append(certs, decoded)
}
decoded, pemblock = pem.Decode(pemblock)
} </s> remove pemblock := []byte(pkey)
for {
var decoded *pem.Block
decoded, pemblock = pem.Decode(pemblock)
if decoded == nil {
break
}
</s> add for decoded, pemblock := pem.Decode([]byte(pkey)); decoded != nil; { </s> remove if decoded.Type == "CERTIFICATE" {
certs = append(certs, decoded)
}
</s> add pool := x509.NewCertPool()
for _, cert := range others {
log.Info("tls: got an intermediate cert")
pool.AddCert(cert) </s> remove // validateCertificates processes certificate data and its private key. All
// parameters are optional. status must not be nil. The returned error is also
// set in status.WarningValidation.
</s> add // validateCertificates processes certificate data and its private key. status
// must not be nil, since it's used to accumulate the validation results. Other
// parameters are optional. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
... | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls.go |
pool := x509.NewCertPool()
for _, cert := range others {
log.Info("tls: got an intermediate cert")
pool.AddCert(cert) | <mask> if decoded == nil {
<mask> break
<mask> }
<mask>
<mask> if decoded.Type == "CERTIFICATE" {
<mask> certs = append(certs, decoded)
<mask> }
<mask> }
<mask>
<mask> parsedCerts, err := parsePEMCerts(certs)
<mask> if err != nil {
<mask> return err
</s> Pull request: 4898-redirect-https
Merge in DNS/adguard-home from 4898-redirect-https to master
Updates #4898.
Updates #4927.
Squashed commit of the following:
commit bc41b6cae7ede0f1235e3956ab49204af1c9f38d
Merge: 815e2991 ac7634da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 13:02:23 2022 +0300
Merge branch 'master' into 4898-redirect-https
commit 815e299137224fc3c7fd46924d7b936515b95d67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 12:58:28 2022 +0300
home: imp ip addr detection
commit 9d4ecd9ab0e13ef6c19c3b923363bff43394ea4c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 17:23:41 2022 +0300
home: imp cyclo
commit 86c47b68fe6e3916cec97eee5d34e3e6c18e4892
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 15:06:05 2022 +0300
all: imp text
commit bcc25697b551668d1dab53a874e716fcadd83f09
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 11:47:57 2022 +0300
home: fix test
commit bb51a74cb82eeaa977821fa7314810c7b8be55cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Oct 30 23:23:40 2022 +0300
home: imp code
commit 38522330691baf8475a59ed4f40b1d45363df1e3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 28 17:00:50 2022 +0300
home: imp code
commit 7284f7288feb7491560f0f5d2754044c7a9f603a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:42:57 2022 +0300
all: log changes
commit 540efcb013e15294b98efe581323f75ceefc8f5a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:24:21 2022 +0300
home: imp tls </s> remove opts.Intermediates = pool
</s> add var certs []*pem.Block
for decoded, pemblock := pem.Decode(chain); decoded != nil; {
if decoded.Type == "CERTIFICATE" {
certs = append(certs, decoded)
}
decoded, pemblock = pem.Decode(pemblock)
} </s> remove parsedCerts, err := parsePEMCerts(certs)
</s> add opts := x509.VerifyOptions{
DNSName: srvName,
Roots: Context.tlsRoots,
Intermediates: pool,
}
_, err = main.Verify(opts) </s> remove // validateCertChain validates the certificate chain and sets data in status.
// The returned error is also set in status.WarningValidation.
func validateCertChain(status *tlsConfigStatus, certChain []byte, serverName string) (err error) {
defer func() {
if err != nil {
status.WarningValidation = err.Error()
}
}()
log.Debug("tls: got certificate chain: %d bytes", len(certChain))
var certs []*pem.Block
pemblock := certChain
for {
var decoded *pem.Block
decoded, pemblock = pem.Decode(pemblock)
if decoded == nil {
break
}
</s> add // validateCertChain verifies certs using the first as the main one and others
// as intermediate. srvName stands for the expected DNS name.
func validateCertChain(certs []*x509.Certificate, srvName string) (err error) {
main, others := certs[0], certs[1:] </s> remove return err
</s> add return fmt.Errorf("certificate does not verify: %w", err) </s> remove pemblock := []byte(pkey)
for {
var decoded *pem.Block
decoded, pemblock = pem.Decode(pemblock)
if decoded == nil {
break
}
</s> add for decoded, pemblock := pem.Decode([]byte(pkey)); decoded != nil; { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls.go |
opts := x509.VerifyOptions{
DNSName: srvName,
Roots: Context.tlsRoots,
Intermediates: pool,
}
_, err = main.Verify(opts) | <mask> certs = append(certs, decoded)
<mask> }
<mask> }
<mask>
<mask> parsedCerts, err := parsePEMCerts(certs)
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> status.ValidCert = true
</s> Pull request: 4898-redirect-https
Merge in DNS/adguard-home from 4898-redirect-https to master
Updates #4898.
Updates #4927.
Squashed commit of the following:
commit bc41b6cae7ede0f1235e3956ab49204af1c9f38d
Merge: 815e2991 ac7634da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 13:02:23 2022 +0300
Merge branch 'master' into 4898-redirect-https
commit 815e299137224fc3c7fd46924d7b936515b95d67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 12:58:28 2022 +0300
home: imp ip addr detection
commit 9d4ecd9ab0e13ef6c19c3b923363bff43394ea4c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 17:23:41 2022 +0300
home: imp cyclo
commit 86c47b68fe6e3916cec97eee5d34e3e6c18e4892
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 15:06:05 2022 +0300
all: imp text
commit bcc25697b551668d1dab53a874e716fcadd83f09
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 11:47:57 2022 +0300
home: fix test
commit bb51a74cb82eeaa977821fa7314810c7b8be55cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Oct 30 23:23:40 2022 +0300
home: imp code
commit 38522330691baf8475a59ed4f40b1d45363df1e3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 28 17:00:50 2022 +0300
home: imp code
commit 7284f7288feb7491560f0f5d2754044c7a9f603a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:42:57 2022 +0300
all: log changes
commit 540efcb013e15294b98efe581323f75ceefc8f5a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:24:21 2022 +0300
home: imp tls </s> remove if decoded.Type == "CERTIFICATE" {
certs = append(certs, decoded)
}
</s> add pool := x509.NewCertPool()
for _, cert := range others {
log.Info("tls: got an intermediate cert")
pool.AddCert(cert) </s> remove return err
</s> add return fmt.Errorf("certificate does not verify: %w", err) </s> remove mainCert := parsedCerts[0]
_, err = mainCert.Verify(opts)
</s> add parsedCerts, err = parsePEMCerts(certs) </s> remove opts.Intermediates = pool
</s> add var certs []*pem.Block
for decoded, pemblock := pem.Decode(chain); decoded != nil; {
if decoded.Type == "CERTIFICATE" {
certs = append(certs, decoded)
}
decoded, pemblock = pem.Decode(pemblock)
} </s> remove // Let self-signed certs through and don't return this error.
status.WarningValidation = fmt.Sprintf("certificate does not verify: %s", err)
} else {
status.ValidChain = true
</s> add return nil, false, err | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls.go |
return fmt.Errorf("certificate does not verify: %w", err) | <mask> }
<mask>
<mask> parsedCerts, err := parsePEMCerts(certs)
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> status.ValidCert = true
<mask>
<mask> opts := x509.VerifyOptions{
</s> Pull request: 4898-redirect-https
Merge in DNS/adguard-home from 4898-redirect-https to master
Updates #4898.
Updates #4927.
Squashed commit of the following:
commit bc41b6cae7ede0f1235e3956ab49204af1c9f38d
Merge: 815e2991 ac7634da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 13:02:23 2022 +0300
Merge branch 'master' into 4898-redirect-https
commit 815e299137224fc3c7fd46924d7b936515b95d67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 12:58:28 2022 +0300
home: imp ip addr detection
commit 9d4ecd9ab0e13ef6c19c3b923363bff43394ea4c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 17:23:41 2022 +0300
home: imp cyclo
commit 86c47b68fe6e3916cec97eee5d34e3e6c18e4892
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 15:06:05 2022 +0300
all: imp text
commit bcc25697b551668d1dab53a874e716fcadd83f09
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 11:47:57 2022 +0300
home: fix test
commit bb51a74cb82eeaa977821fa7314810c7b8be55cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Oct 30 23:23:40 2022 +0300
home: imp code
commit 38522330691baf8475a59ed4f40b1d45363df1e3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 28 17:00:50 2022 +0300
home: imp code
commit 7284f7288feb7491560f0f5d2754044c7a9f603a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:42:57 2022 +0300
all: log changes
commit 540efcb013e15294b98efe581323f75ceefc8f5a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:24:21 2022 +0300
home: imp tls </s> remove parsedCerts, err := parsePEMCerts(certs)
</s> add opts := x509.VerifyOptions{
DNSName: srvName,
Roots: Context.tlsRoots,
Intermediates: pool,
}
_, err = main.Verify(opts) </s> remove opts := x509.VerifyOptions{
DNSName: serverName,
Roots: Context.tlsRoots,
</s> add for _, name := range cert.DNSNames {
if _, err := netip.ParseAddr(name); err == nil {
return true
} </s> remove status.ValidCert = true
</s> add return nil
}
// certHasIP returns true if cert has at least a single IP address either in its
// DNS names or in the IP addresses section.
func certHasIP(cert *x509.Certificate) (ok bool) {
if len(cert.IPAddresses) > 0 {
return true
} </s> remove if decoded.Type == "CERTIFICATE" {
certs = append(certs, decoded)
}
</s> add pool := x509.NewCertPool()
for _, cert := range others {
log.Info("tls: got an intermediate cert")
pool.AddCert(cert) </s> remove mainCert := parsedCerts[0]
_, err = mainCert.Verify(opts)
</s> add parsedCerts, err = parsePEMCerts(certs) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls.go |
return nil
}
// certHasIP returns true if cert has at least a single IP address either in its
// DNS names or in the IP addresses section.
func certHasIP(cert *x509.Certificate) (ok bool) {
if len(cert.IPAddresses) > 0 {
return true
} | <mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> status.ValidCert = true
<mask>
<mask> opts := x509.VerifyOptions{
<mask> DNSName: serverName,
<mask> Roots: Context.tlsRoots,
<mask> }
</s> Pull request: 4898-redirect-https
Merge in DNS/adguard-home from 4898-redirect-https to master
Updates #4898.
Updates #4927.
Squashed commit of the following:
commit bc41b6cae7ede0f1235e3956ab49204af1c9f38d
Merge: 815e2991 ac7634da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 13:02:23 2022 +0300
Merge branch 'master' into 4898-redirect-https
commit 815e299137224fc3c7fd46924d7b936515b95d67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 12:58:28 2022 +0300
home: imp ip addr detection
commit 9d4ecd9ab0e13ef6c19c3b923363bff43394ea4c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 17:23:41 2022 +0300
home: imp cyclo
commit 86c47b68fe6e3916cec97eee5d34e3e6c18e4892
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 15:06:05 2022 +0300
all: imp text
commit bcc25697b551668d1dab53a874e716fcadd83f09
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 11:47:57 2022 +0300
home: fix test
commit bb51a74cb82eeaa977821fa7314810c7b8be55cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Oct 30 23:23:40 2022 +0300
home: imp code
commit 38522330691baf8475a59ed4f40b1d45363df1e3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 28 17:00:50 2022 +0300
home: imp code
commit 7284f7288feb7491560f0f5d2754044c7a9f603a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:42:57 2022 +0300
all: log changes
commit 540efcb013e15294b98efe581323f75ceefc8f5a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:24:21 2022 +0300
home: imp tls </s> remove opts := x509.VerifyOptions{
DNSName: serverName,
Roots: Context.tlsRoots,
</s> add for _, name := range cert.DNSNames {
if _, err := netip.ParseAddr(name); err == nil {
return true
} </s> remove parsedCerts, err := parsePEMCerts(certs)
</s> add opts := x509.VerifyOptions{
DNSName: srvName,
Roots: Context.tlsRoots,
Intermediates: pool,
}
_, err = main.Verify(opts) </s> remove return err
</s> add return fmt.Errorf("certificate does not verify: %w", err) </s> remove log.Info("tls: number of certs: %d", len(parsedCerts))
</s> add return false
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls.go |
for _, name := range cert.DNSNames {
if _, err := netip.ParseAddr(name); err == nil {
return true
} | <mask> }
<mask>
<mask> status.ValidCert = true
<mask>
<mask> opts := x509.VerifyOptions{
<mask> DNSName: serverName,
<mask> Roots: Context.tlsRoots,
<mask> }
<mask>
<mask> log.Info("tls: number of certs: %d", len(parsedCerts))
<mask>
<mask> pool := x509.NewCertPool()
</s> Pull request: 4898-redirect-https
Merge in DNS/adguard-home from 4898-redirect-https to master
Updates #4898.
Updates #4927.
Squashed commit of the following:
commit bc41b6cae7ede0f1235e3956ab49204af1c9f38d
Merge: 815e2991 ac7634da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 13:02:23 2022 +0300
Merge branch 'master' into 4898-redirect-https
commit 815e299137224fc3c7fd46924d7b936515b95d67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 12:58:28 2022 +0300
home: imp ip addr detection
commit 9d4ecd9ab0e13ef6c19c3b923363bff43394ea4c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 17:23:41 2022 +0300
home: imp cyclo
commit 86c47b68fe6e3916cec97eee5d34e3e6c18e4892
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 15:06:05 2022 +0300
all: imp text
commit bcc25697b551668d1dab53a874e716fcadd83f09
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 11:47:57 2022 +0300
home: fix test
commit bb51a74cb82eeaa977821fa7314810c7b8be55cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Oct 30 23:23:40 2022 +0300
home: imp code
commit 38522330691baf8475a59ed4f40b1d45363df1e3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 28 17:00:50 2022 +0300
home: imp code
commit 7284f7288feb7491560f0f5d2754044c7a9f603a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:42:57 2022 +0300
all: log changes
commit 540efcb013e15294b98efe581323f75ceefc8f5a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:24:21 2022 +0300
home: imp tls </s> remove log.Info("tls: number of certs: %d", len(parsedCerts))
</s> add return false
} </s> remove parsedCerts, err := parsePEMCerts(certs)
</s> add opts := x509.VerifyOptions{
DNSName: srvName,
Roots: Context.tlsRoots,
Intermediates: pool,
}
_, err = main.Verify(opts) </s> remove pool := x509.NewCertPool()
for _, cert := range parsedCerts[1:] {
log.Info("tls: got an intermediate cert")
pool.AddCert(cert)
}
</s> add // parseCertChain parses the certificate chain from raw data, and returns it.
// If ok is true, the returned error, if any, is not critical.
func parseCertChain(chain []byte) (parsedCerts []*x509.Certificate, ok bool, err error) {
log.Debug("tls: got certificate chain: %d bytes", len(chain)) </s> remove status.ValidCert = true
</s> add return nil
}
// certHasIP returns true if cert has at least a single IP address either in its
// DNS names or in the IP addresses section.
func certHasIP(cert *x509.Certificate) (ok bool) {
if len(cert.IPAddresses) > 0 {
return true
} </s> remove if mainCert != nil {
status.Subject = mainCert.Subject.String()
status.Issuer = mainCert.Issuer.String()
status.NotAfter = mainCert.NotAfter
status.NotBefore = mainCert.NotBefore
status.DNSNames = mainCert.DNSNames
</s> add log.Info("tls: number of certs: %d", len(parsedCerts))
if !certHasIP(parsedCerts[0]) {
err = errors.Error(`certificate has no IP addresses` +
`, this may cause issues with DNS-over-TLS clients`) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls.go |
return false
} | <mask> DNSName: serverName,
<mask> Roots: Context.tlsRoots,
<mask> }
<mask>
<mask> log.Info("tls: number of certs: %d", len(parsedCerts))
<mask>
<mask> pool := x509.NewCertPool()
<mask> for _, cert := range parsedCerts[1:] {
<mask> log.Info("tls: got an intermediate cert")
<mask> pool.AddCert(cert)
</s> Pull request: 4898-redirect-https
Merge in DNS/adguard-home from 4898-redirect-https to master
Updates #4898.
Updates #4927.
Squashed commit of the following:
commit bc41b6cae7ede0f1235e3956ab49204af1c9f38d
Merge: 815e2991 ac7634da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 13:02:23 2022 +0300
Merge branch 'master' into 4898-redirect-https
commit 815e299137224fc3c7fd46924d7b936515b95d67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 12:58:28 2022 +0300
home: imp ip addr detection
commit 9d4ecd9ab0e13ef6c19c3b923363bff43394ea4c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 17:23:41 2022 +0300
home: imp cyclo
commit 86c47b68fe6e3916cec97eee5d34e3e6c18e4892
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 15:06:05 2022 +0300
all: imp text
commit bcc25697b551668d1dab53a874e716fcadd83f09
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 11:47:57 2022 +0300
home: fix test
commit bb51a74cb82eeaa977821fa7314810c7b8be55cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Oct 30 23:23:40 2022 +0300
home: imp code
commit 38522330691baf8475a59ed4f40b1d45363df1e3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 28 17:00:50 2022 +0300
home: imp code
commit 7284f7288feb7491560f0f5d2754044c7a9f603a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:42:57 2022 +0300
all: log changes
commit 540efcb013e15294b98efe581323f75ceefc8f5a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:24:21 2022 +0300
home: imp tls </s> remove opts := x509.VerifyOptions{
DNSName: serverName,
Roots: Context.tlsRoots,
</s> add for _, name := range cert.DNSNames {
if _, err := netip.ParseAddr(name); err == nil {
return true
} </s> remove pool := x509.NewCertPool()
for _, cert := range parsedCerts[1:] {
log.Info("tls: got an intermediate cert")
pool.AddCert(cert)
}
</s> add // parseCertChain parses the certificate chain from raw data, and returns it.
// If ok is true, the returned error, if any, is not critical.
func parseCertChain(chain []byte) (parsedCerts []*x509.Certificate, ok bool, err error) {
log.Debug("tls: got certificate chain: %d bytes", len(chain)) </s> remove if decoded.Type == "CERTIFICATE" {
certs = append(certs, decoded)
}
</s> add pool := x509.NewCertPool()
for _, cert := range others {
log.Info("tls: got an intermediate cert")
pool.AddCert(cert) </s> remove opts.Intermediates = pool
</s> add var certs []*pem.Block
for decoded, pemblock := pem.Decode(chain); decoded != nil; {
if decoded.Type == "CERTIFICATE" {
certs = append(certs, decoded)
}
decoded, pemblock = pem.Decode(pemblock)
} </s> remove if mainCert != nil {
status.Subject = mainCert.Subject.String()
status.Issuer = mainCert.Issuer.String()
status.NotAfter = mainCert.NotAfter
status.NotBefore = mainCert.NotBefore
status.DNSNames = mainCert.DNSNames
</s> add log.Info("tls: number of certs: %d", len(parsedCerts))
if !certHasIP(parsedCerts[0]) {
err = errors.Error(`certificate has no IP addresses` +
`, this may cause issues with DNS-over-TLS clients`) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls.go |
// parseCertChain parses the certificate chain from raw data, and returns it.
// If ok is true, the returned error, if any, is not critical.
func parseCertChain(chain []byte) (parsedCerts []*x509.Certificate, ok bool, err error) {
log.Debug("tls: got certificate chain: %d bytes", len(chain)) | <mask> }
<mask>
<mask> log.Info("tls: number of certs: %d", len(parsedCerts))
<mask>
<mask> pool := x509.NewCertPool()
<mask> for _, cert := range parsedCerts[1:] {
<mask> log.Info("tls: got an intermediate cert")
<mask> pool.AddCert(cert)
<mask> }
<mask>
<mask> opts.Intermediates = pool
<mask>
<mask> mainCert := parsedCerts[0]
<mask> _, err = mainCert.Verify(opts)
</s> Pull request: 4898-redirect-https
Merge in DNS/adguard-home from 4898-redirect-https to master
Updates #4898.
Updates #4927.
Squashed commit of the following:
commit bc41b6cae7ede0f1235e3956ab49204af1c9f38d
Merge: 815e2991 ac7634da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 13:02:23 2022 +0300
Merge branch 'master' into 4898-redirect-https
commit 815e299137224fc3c7fd46924d7b936515b95d67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 12:58:28 2022 +0300
home: imp ip addr detection
commit 9d4ecd9ab0e13ef6c19c3b923363bff43394ea4c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 17:23:41 2022 +0300
home: imp cyclo
commit 86c47b68fe6e3916cec97eee5d34e3e6c18e4892
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 15:06:05 2022 +0300
all: imp text
commit bcc25697b551668d1dab53a874e716fcadd83f09
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 11:47:57 2022 +0300
home: fix test
commit bb51a74cb82eeaa977821fa7314810c7b8be55cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Oct 30 23:23:40 2022 +0300
home: imp code
commit 38522330691baf8475a59ed4f40b1d45363df1e3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 28 17:00:50 2022 +0300
home: imp code
commit 7284f7288feb7491560f0f5d2754044c7a9f603a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:42:57 2022 +0300
all: log changes
commit 540efcb013e15294b98efe581323f75ceefc8f5a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:24:21 2022 +0300
home: imp tls </s> remove log.Info("tls: number of certs: %d", len(parsedCerts))
</s> add return false
} </s> remove opts := x509.VerifyOptions{
DNSName: serverName,
Roots: Context.tlsRoots,
</s> add for _, name := range cert.DNSNames {
if _, err := netip.ParseAddr(name); err == nil {
return true
} </s> remove if decoded.Type == "CERTIFICATE" {
certs = append(certs, decoded)
}
</s> add pool := x509.NewCertPool()
for _, cert := range others {
log.Info("tls: got an intermediate cert")
pool.AddCert(cert) </s> remove opts.Intermediates = pool
</s> add var certs []*pem.Block
for decoded, pemblock := pem.Decode(chain); decoded != nil; {
if decoded.Type == "CERTIFICATE" {
certs = append(certs, decoded)
}
decoded, pemblock = pem.Decode(pemblock)
} </s> remove mainCert := parsedCerts[0]
_, err = mainCert.Verify(opts)
</s> add parsedCerts, err = parsePEMCerts(certs) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls.go |
var certs []*pem.Block
for decoded, pemblock := pem.Decode(chain); decoded != nil; {
if decoded.Type == "CERTIFICATE" {
certs = append(certs, decoded)
}
decoded, pemblock = pem.Decode(pemblock)
} | <mask> log.Info("tls: got an intermediate cert")
<mask> pool.AddCert(cert)
<mask> }
<mask>
<mask> opts.Intermediates = pool
<mask>
<mask> mainCert := parsedCerts[0]
<mask> _, err = mainCert.Verify(opts)
<mask> if err != nil {
<mask> // Let self-signed certs through and don't return this error.
</s> Pull request: 4898-redirect-https
Merge in DNS/adguard-home from 4898-redirect-https to master
Updates #4898.
Updates #4927.
Squashed commit of the following:
commit bc41b6cae7ede0f1235e3956ab49204af1c9f38d
Merge: 815e2991 ac7634da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 13:02:23 2022 +0300
Merge branch 'master' into 4898-redirect-https
commit 815e299137224fc3c7fd46924d7b936515b95d67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 12:58:28 2022 +0300
home: imp ip addr detection
commit 9d4ecd9ab0e13ef6c19c3b923363bff43394ea4c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 17:23:41 2022 +0300
home: imp cyclo
commit 86c47b68fe6e3916cec97eee5d34e3e6c18e4892
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 15:06:05 2022 +0300
all: imp text
commit bcc25697b551668d1dab53a874e716fcadd83f09
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 11:47:57 2022 +0300
home: fix test
commit bb51a74cb82eeaa977821fa7314810c7b8be55cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Oct 30 23:23:40 2022 +0300
home: imp code
commit 38522330691baf8475a59ed4f40b1d45363df1e3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 28 17:00:50 2022 +0300
home: imp code
commit 7284f7288feb7491560f0f5d2754044c7a9f603a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:42:57 2022 +0300
all: log changes
commit 540efcb013e15294b98efe581323f75ceefc8f5a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:24:21 2022 +0300
home: imp tls </s> remove mainCert := parsedCerts[0]
_, err = mainCert.Verify(opts)
</s> add parsedCerts, err = parsePEMCerts(certs) </s> remove // Let self-signed certs through and don't return this error.
status.WarningValidation = fmt.Sprintf("certificate does not verify: %s", err)
} else {
status.ValidChain = true
</s> add return nil, false, err </s> remove pool := x509.NewCertPool()
for _, cert := range parsedCerts[1:] {
log.Info("tls: got an intermediate cert")
pool.AddCert(cert)
}
</s> add // parseCertChain parses the certificate chain from raw data, and returns it.
// If ok is true, the returned error, if any, is not critical.
func parseCertChain(chain []byte) (parsedCerts []*x509.Certificate, ok bool, err error) {
log.Debug("tls: got certificate chain: %d bytes", len(chain)) </s> remove if decoded.Type == "CERTIFICATE" {
certs = append(certs, decoded)
}
</s> add pool := x509.NewCertPool()
for _, cert := range others {
log.Info("tls: got an intermediate cert")
pool.AddCert(cert) </s> remove log.Info("tls: number of certs: %d", len(parsedCerts))
</s> add return false
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls.go |
parsedCerts, err = parsePEMCerts(certs) | <mask> }
<mask>
<mask> opts.Intermediates = pool
<mask>
<mask> mainCert := parsedCerts[0]
<mask> _, err = mainCert.Verify(opts)
<mask> if err != nil {
<mask> // Let self-signed certs through and don't return this error.
<mask> status.WarningValidation = fmt.Sprintf("certificate does not verify: %s", err)
<mask> } else {
<mask> status.ValidChain = true
</s> Pull request: 4898-redirect-https
Merge in DNS/adguard-home from 4898-redirect-https to master
Updates #4898.
Updates #4927.
Squashed commit of the following:
commit bc41b6cae7ede0f1235e3956ab49204af1c9f38d
Merge: 815e2991 ac7634da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 13:02:23 2022 +0300
Merge branch 'master' into 4898-redirect-https
commit 815e299137224fc3c7fd46924d7b936515b95d67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 12:58:28 2022 +0300
home: imp ip addr detection
commit 9d4ecd9ab0e13ef6c19c3b923363bff43394ea4c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 17:23:41 2022 +0300
home: imp cyclo
commit 86c47b68fe6e3916cec97eee5d34e3e6c18e4892
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 15:06:05 2022 +0300
all: imp text
commit bcc25697b551668d1dab53a874e716fcadd83f09
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 11:47:57 2022 +0300
home: fix test
commit bb51a74cb82eeaa977821fa7314810c7b8be55cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Oct 30 23:23:40 2022 +0300
home: imp code
commit 38522330691baf8475a59ed4f40b1d45363df1e3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 28 17:00:50 2022 +0300
home: imp code
commit 7284f7288feb7491560f0f5d2754044c7a9f603a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:42:57 2022 +0300
all: log changes
commit 540efcb013e15294b98efe581323f75ceefc8f5a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:24:21 2022 +0300
home: imp tls </s> remove // Let self-signed certs through and don't return this error.
status.WarningValidation = fmt.Sprintf("certificate does not verify: %s", err)
} else {
status.ValidChain = true
</s> add return nil, false, err </s> remove opts.Intermediates = pool
</s> add var certs []*pem.Block
for decoded, pemblock := pem.Decode(chain); decoded != nil; {
if decoded.Type == "CERTIFICATE" {
certs = append(certs, decoded)
}
decoded, pemblock = pem.Decode(pemblock)
} </s> remove return err
</s> add return fmt.Errorf("certificate does not verify: %w", err) </s> remove if mainCert != nil {
status.Subject = mainCert.Subject.String()
status.Issuer = mainCert.Issuer.String()
status.NotAfter = mainCert.NotAfter
status.NotBefore = mainCert.NotBefore
status.DNSNames = mainCert.DNSNames
</s> add log.Info("tls: number of certs: %d", len(parsedCerts))
if !certHasIP(parsedCerts[0]) {
err = errors.Error(`certificate has no IP addresses` +
`, this may cause issues with DNS-over-TLS clients`) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls.go |
return nil, false, err | <mask>
<mask> mainCert := parsedCerts[0]
<mask> _, err = mainCert.Verify(opts)
<mask> if err != nil {
<mask> // Let self-signed certs through and don't return this error.
<mask> status.WarningValidation = fmt.Sprintf("certificate does not verify: %s", err)
<mask> } else {
<mask> status.ValidChain = true
<mask> }
<mask>
<mask> if mainCert != nil {
<mask> status.Subject = mainCert.Subject.String()
<mask> status.Issuer = mainCert.Issuer.String()
</s> Pull request: 4898-redirect-https
Merge in DNS/adguard-home from 4898-redirect-https to master
Updates #4898.
Updates #4927.
Squashed commit of the following:
commit bc41b6cae7ede0f1235e3956ab49204af1c9f38d
Merge: 815e2991 ac7634da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 13:02:23 2022 +0300
Merge branch 'master' into 4898-redirect-https
commit 815e299137224fc3c7fd46924d7b936515b95d67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 12:58:28 2022 +0300
home: imp ip addr detection
commit 9d4ecd9ab0e13ef6c19c3b923363bff43394ea4c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 17:23:41 2022 +0300
home: imp cyclo
commit 86c47b68fe6e3916cec97eee5d34e3e6c18e4892
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 15:06:05 2022 +0300
all: imp text
commit bcc25697b551668d1dab53a874e716fcadd83f09
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 11:47:57 2022 +0300
home: fix test
commit bb51a74cb82eeaa977821fa7314810c7b8be55cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Oct 30 23:23:40 2022 +0300
home: imp code
commit 38522330691baf8475a59ed4f40b1d45363df1e3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 28 17:00:50 2022 +0300
home: imp code
commit 7284f7288feb7491560f0f5d2754044c7a9f603a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:42:57 2022 +0300
all: log changes
commit 540efcb013e15294b98efe581323f75ceefc8f5a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:24:21 2022 +0300
home: imp tls </s> remove mainCert := parsedCerts[0]
_, err = mainCert.Verify(opts)
</s> add parsedCerts, err = parsePEMCerts(certs) </s> remove opts.Intermediates = pool
</s> add var certs []*pem.Block
for decoded, pemblock := pem.Decode(chain); decoded != nil; {
if decoded.Type == "CERTIFICATE" {
certs = append(certs, decoded)
}
decoded, pemblock = pem.Decode(pemblock)
} </s> remove if mainCert != nil {
status.Subject = mainCert.Subject.String()
status.Issuer = mainCert.Issuer.String()
status.NotAfter = mainCert.NotAfter
status.NotBefore = mainCert.NotBefore
status.DNSNames = mainCert.DNSNames
</s> add log.Info("tls: number of certs: %d", len(parsedCerts))
if !certHasIP(parsedCerts[0]) {
err = errors.Error(`certificate has no IP addresses` +
`, this may cause issues with DNS-over-TLS clients`) </s> remove return err
</s> add return fmt.Errorf("certificate does not verify: %w", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls.go |
log.Info("tls: number of certs: %d", len(parsedCerts))
if !certHasIP(parsedCerts[0]) {
err = errors.Error(`certificate has no IP addresses` +
`, this may cause issues with DNS-over-TLS clients`) | <mask> } else {
<mask> status.ValidChain = true
<mask> }
<mask>
<mask> if mainCert != nil {
<mask> status.Subject = mainCert.Subject.String()
<mask> status.Issuer = mainCert.Issuer.String()
<mask> status.NotAfter = mainCert.NotAfter
<mask> status.NotBefore = mainCert.NotBefore
<mask> status.DNSNames = mainCert.DNSNames
<mask> }
<mask>
<mask> return nil
<mask> }
<mask>
</s> Pull request: 4898-redirect-https
Merge in DNS/adguard-home from 4898-redirect-https to master
Updates #4898.
Updates #4927.
Squashed commit of the following:
commit bc41b6cae7ede0f1235e3956ab49204af1c9f38d
Merge: 815e2991 ac7634da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 13:02:23 2022 +0300
Merge branch 'master' into 4898-redirect-https
commit 815e299137224fc3c7fd46924d7b936515b95d67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 12:58:28 2022 +0300
home: imp ip addr detection
commit 9d4ecd9ab0e13ef6c19c3b923363bff43394ea4c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 17:23:41 2022 +0300
home: imp cyclo
commit 86c47b68fe6e3916cec97eee5d34e3e6c18e4892
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 15:06:05 2022 +0300
all: imp text
commit bcc25697b551668d1dab53a874e716fcadd83f09
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 11:47:57 2022 +0300
home: fix test
commit bb51a74cb82eeaa977821fa7314810c7b8be55cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Oct 30 23:23:40 2022 +0300
home: imp code
commit 38522330691baf8475a59ed4f40b1d45363df1e3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 28 17:00:50 2022 +0300
home: imp code
commit 7284f7288feb7491560f0f5d2754044c7a9f603a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:42:57 2022 +0300
all: log changes
commit 540efcb013e15294b98efe581323f75ceefc8f5a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:24:21 2022 +0300
home: imp tls </s> remove // Let self-signed certs through and don't return this error.
status.WarningValidation = fmt.Sprintf("certificate does not verify: %s", err)
} else {
status.ValidChain = true
</s> add return nil, false, err </s> remove return nil
</s> add return parsedCerts, true, err </s> remove mainCert := parsedCerts[0]
_, err = mainCert.Verify(opts)
</s> add parsedCerts, err = parsePEMCerts(certs) </s> remove _, err = tls.X509KeyPair(certChain, pkey)
if err != nil {
err = fmt.Errorf("certificate-key pair: %w", err)
status.WarningValidation = err.Error()
return err
</s> add _, pairErr := tls.X509KeyPair(certChain, pkey)
if pairErr != nil {
return fmt.Errorf("certificate-key pair: %w", pairErr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls.go |
return parsedCerts, true, err | <mask> status.NotBefore = mainCert.NotBefore
<mask> status.DNSNames = mainCert.DNSNames
<mask> }
<mask>
<mask> return nil
<mask> }
<mask>
<mask> // parsePEMCerts parses multiple PEM-encoded certificates.
<mask> func parsePEMCerts(certs []*pem.Block) (parsedCerts []*x509.Certificate, err error) {
<mask> for i, cert := range certs {
</s> Pull request: 4898-redirect-https
Merge in DNS/adguard-home from 4898-redirect-https to master
Updates #4898.
Updates #4927.
Squashed commit of the following:
commit bc41b6cae7ede0f1235e3956ab49204af1c9f38d
Merge: 815e2991 ac7634da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 13:02:23 2022 +0300
Merge branch 'master' into 4898-redirect-https
commit 815e299137224fc3c7fd46924d7b936515b95d67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 12:58:28 2022 +0300
home: imp ip addr detection
commit 9d4ecd9ab0e13ef6c19c3b923363bff43394ea4c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 17:23:41 2022 +0300
home: imp cyclo
commit 86c47b68fe6e3916cec97eee5d34e3e6c18e4892
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 15:06:05 2022 +0300
all: imp text
commit bcc25697b551668d1dab53a874e716fcadd83f09
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 11:47:57 2022 +0300
home: fix test
commit bb51a74cb82eeaa977821fa7314810c7b8be55cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Oct 30 23:23:40 2022 +0300
home: imp code
commit 38522330691baf8475a59ed4f40b1d45363df1e3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 28 17:00:50 2022 +0300
home: imp code
commit 7284f7288feb7491560f0f5d2754044c7a9f603a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:42:57 2022 +0300
all: log changes
commit 540efcb013e15294b98efe581323f75ceefc8f5a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:24:21 2022 +0300
home: imp tls </s> remove pool := x509.NewCertPool()
for _, cert := range parsedCerts[1:] {
log.Info("tls: got an intermediate cert")
pool.AddCert(cert)
}
</s> add // parseCertChain parses the certificate chain from raw data, and returns it.
// If ok is true, the returned error, if any, is not critical.
func parseCertChain(chain []byte) (parsedCerts []*x509.Certificate, ok bool, err error) {
log.Debug("tls: got certificate chain: %d bytes", len(chain)) </s> remove if mainCert != nil {
status.Subject = mainCert.Subject.String()
status.Issuer = mainCert.Issuer.String()
status.NotAfter = mainCert.NotAfter
status.NotBefore = mainCert.NotBefore
status.DNSNames = mainCert.DNSNames
</s> add log.Info("tls: number of certs: %d", len(parsedCerts))
if !certHasIP(parsedCerts[0]) {
err = errors.Error(`certificate has no IP addresses` +
`, this may cause issues with DNS-over-TLS clients`) </s> remove if decoded.Type == "CERTIFICATE" {
certs = append(certs, decoded)
}
</s> add pool := x509.NewCertPool()
for _, cert := range others {
log.Info("tls: got an intermediate cert")
pool.AddCert(cert) </s> remove // validateCertChain validates the certificate chain and sets data in status.
// The returned error is also set in status.WarningValidation.
func validateCertChain(status *tlsConfigStatus, certChain []byte, serverName string) (err error) {
defer func() {
if err != nil {
status.WarningValidation = err.Error()
}
}()
log.Debug("tls: got certificate chain: %d bytes", len(certChain))
var certs []*pem.Block
pemblock := certChain
for {
var decoded *pem.Block
decoded, pemblock = pem.Decode(pemblock)
if decoded == nil {
break
}
</s> add // validateCertChain verifies certs using the first as the main one and others
// as intermediate. srvName stands for the expected DNS name.
func validateCertChain(certs []*x509.Certificate, srvName string) (err error) {
main, others := certs[0], certs[1:] | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls.go |
// validatePKey validates the private key, returning its type. It returns an
// empty string if error occurs.
func validatePKey(pkey []byte) (keyType string, err error) { | <mask>
<mask> return parsedCerts, nil
<mask> }
<mask>
<mask> // validatePKey validates the private key and sets data in status. The returned
<mask> // error is also set in status.WarningValidation.
<mask> func validatePKey(status *tlsConfigStatus, pkey []byte) (err error) {
<mask> defer func() {
<mask> if err != nil {
<mask> status.WarningValidation = err.Error()
<mask> }
<mask> }()
<mask>
<mask> var key *pem.Block
<mask>
<mask> // Go through all pem blocks, but take first valid pem block and drop the
<mask> // rest.
<mask> pemblock := []byte(pkey)
</s> Pull request: 4898-redirect-https
Merge in DNS/adguard-home from 4898-redirect-https to master
Updates #4898.
Updates #4927.
Squashed commit of the following:
commit bc41b6cae7ede0f1235e3956ab49204af1c9f38d
Merge: 815e2991 ac7634da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 13:02:23 2022 +0300
Merge branch 'master' into 4898-redirect-https
commit 815e299137224fc3c7fd46924d7b936515b95d67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 12:58:28 2022 +0300
home: imp ip addr detection
commit 9d4ecd9ab0e13ef6c19c3b923363bff43394ea4c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 17:23:41 2022 +0300
home: imp cyclo
commit 86c47b68fe6e3916cec97eee5d34e3e6c18e4892
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 15:06:05 2022 +0300
all: imp text
commit bcc25697b551668d1dab53a874e716fcadd83f09
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 11:47:57 2022 +0300
home: fix test
commit bb51a74cb82eeaa977821fa7314810c7b8be55cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Oct 30 23:23:40 2022 +0300
home: imp code
commit 38522330691baf8475a59ed4f40b1d45363df1e3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 28 17:00:50 2022 +0300
home: imp code
commit 7284f7288feb7491560f0f5d2754044c7a9f603a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:42:57 2022 +0300
all: log changes
commit 540efcb013e15294b98efe581323f75ceefc8f5a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:24:21 2022 +0300
home: imp tls </s> remove pemblock := []byte(pkey)
for {
var decoded *pem.Block
decoded, pemblock = pem.Decode(pemblock)
if decoded == nil {
break
}
</s> add for decoded, pemblock := pem.Decode([]byte(pkey)); decoded != nil; { </s> remove // validateCertChain validates the certificate chain and sets data in status.
// The returned error is also set in status.WarningValidation.
func validateCertChain(status *tlsConfigStatus, certChain []byte, serverName string) (err error) {
defer func() {
if err != nil {
status.WarningValidation = err.Error()
}
}()
log.Debug("tls: got certificate chain: %d bytes", len(certChain))
var certs []*pem.Block
pemblock := certChain
for {
var decoded *pem.Block
decoded, pemblock = pem.Decode(pemblock)
if decoded == nil {
break
}
</s> add // validateCertChain verifies certs using the first as the main one and others
// as intermediate. srvName stands for the expected DNS name.
func validateCertChain(certs []*x509.Certificate, srvName string) (err error) {
main, others := certs[0], certs[1:] </s> remove // validateCertificates processes certificate data and its private key. All
// parameters are optional. status must not be nil. The returned error is also
// set in status.WarningValidation.
</s> add // validateCertificates processes certificate data and its private key. status
// must not be nil, since it's used to accumulate the validation results. Other
// parameters are optional. </s> remove status.ValidKey = true
status.KeyType = keyType
return nil
</s> add return keyType, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls.go |
for decoded, pemblock := pem.Decode([]byte(pkey)); decoded != nil; { | <mask> var key *pem.Block
<mask>
<mask> // Go through all pem blocks, but take first valid pem block and drop the
<mask> // rest.
<mask> pemblock := []byte(pkey)
<mask> for {
<mask> var decoded *pem.Block
<mask> decoded, pemblock = pem.Decode(pemblock)
<mask> if decoded == nil {
<mask> break
<mask> }
<mask>
<mask> if decoded.Type == "PRIVATE KEY" || strings.HasSuffix(decoded.Type, " PRIVATE KEY") {
<mask> key = decoded
<mask>
<mask> break
<mask> }
</s> Pull request: 4898-redirect-https
Merge in DNS/adguard-home from 4898-redirect-https to master
Updates #4898.
Updates #4927.
Squashed commit of the following:
commit bc41b6cae7ede0f1235e3956ab49204af1c9f38d
Merge: 815e2991 ac7634da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 13:02:23 2022 +0300
Merge branch 'master' into 4898-redirect-https
commit 815e299137224fc3c7fd46924d7b936515b95d67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 12:58:28 2022 +0300
home: imp ip addr detection
commit 9d4ecd9ab0e13ef6c19c3b923363bff43394ea4c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 17:23:41 2022 +0300
home: imp cyclo
commit 86c47b68fe6e3916cec97eee5d34e3e6c18e4892
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 15:06:05 2022 +0300
all: imp text
commit bcc25697b551668d1dab53a874e716fcadd83f09
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 11:47:57 2022 +0300
home: fix test
commit bb51a74cb82eeaa977821fa7314810c7b8be55cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Oct 30 23:23:40 2022 +0300
home: imp code
commit 38522330691baf8475a59ed4f40b1d45363df1e3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 28 17:00:50 2022 +0300
home: imp code
commit 7284f7288feb7491560f0f5d2754044c7a9f603a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:42:57 2022 +0300
all: log changes
commit 540efcb013e15294b98efe581323f75ceefc8f5a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:24:21 2022 +0300
home: imp tls </s> remove // validatePKey validates the private key and sets data in status. The returned
// error is also set in status.WarningValidation.
func validatePKey(status *tlsConfigStatus, pkey []byte) (err error) {
defer func() {
if err != nil {
status.WarningValidation = err.Error()
}
}()
</s> add // validatePKey validates the private key, returning its type. It returns an
// empty string if error occurs.
func validatePKey(pkey []byte) (keyType string, err error) { </s> remove // validateCertChain validates the certificate chain and sets data in status.
// The returned error is also set in status.WarningValidation.
func validateCertChain(status *tlsConfigStatus, certChain []byte, serverName string) (err error) {
defer func() {
if err != nil {
status.WarningValidation = err.Error()
}
}()
log.Debug("tls: got certificate chain: %d bytes", len(certChain))
var certs []*pem.Block
pemblock := certChain
for {
var decoded *pem.Block
decoded, pemblock = pem.Decode(pemblock)
if decoded == nil {
break
}
</s> add // validateCertChain verifies certs using the first as the main one and others
// as intermediate. srvName stands for the expected DNS name.
func validateCertChain(certs []*x509.Certificate, srvName string) (err error) {
main, others := certs[0], certs[1:] </s> remove opts.Intermediates = pool
</s> add var certs []*pem.Block
for decoded, pemblock := pem.Decode(chain); decoded != nil; {
if decoded.Type == "CERTIFICATE" {
certs = append(certs, decoded)
}
decoded, pemblock = pem.Decode(pemblock)
} </s> remove if decoded.Type == "CERTIFICATE" {
certs = append(certs, decoded)
}
</s> add pool := x509.NewCertPool()
for _, cert := range others {
log.Info("tls: got an intermediate cert")
pool.AddCert(cert) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls.go |
decoded, pemblock = pem.Decode(pemblock) | <mask> key = decoded
<mask>
<mask> break
<mask> }
<mask> }
<mask>
<mask> if key == nil {
<mask> return "", errors.Error("no valid keys were found")
</s> Pull request: 4898-redirect-https
Merge in DNS/adguard-home from 4898-redirect-https to master
Updates #4898.
Updates #4927.
Squashed commit of the following:
commit bc41b6cae7ede0f1235e3956ab49204af1c9f38d
Merge: 815e2991 ac7634da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 13:02:23 2022 +0300
Merge branch 'master' into 4898-redirect-https
commit 815e299137224fc3c7fd46924d7b936515b95d67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 12:58:28 2022 +0300
home: imp ip addr detection
commit 9d4ecd9ab0e13ef6c19c3b923363bff43394ea4c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 17:23:41 2022 +0300
home: imp cyclo
commit 86c47b68fe6e3916cec97eee5d34e3e6c18e4892
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 15:06:05 2022 +0300
all: imp text
commit bcc25697b551668d1dab53a874e716fcadd83f09
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 11:47:57 2022 +0300
home: fix test
commit bb51a74cb82eeaa977821fa7314810c7b8be55cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Oct 30 23:23:40 2022 +0300
home: imp code
commit 38522330691baf8475a59ed4f40b1d45363df1e3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 28 17:00:50 2022 +0300
home: imp code
commit 7284f7288feb7491560f0f5d2754044c7a9f603a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:42:57 2022 +0300
all: log changes
commit 540efcb013e15294b98efe581323f75ceefc8f5a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:24:21 2022 +0300
home: imp tls </s> remove return errors.Error("no valid keys were found")
</s> add return "", errors.Error("no valid keys were found") </s> remove _, keyType, err := parsePrivateKey(key.Bytes)
</s> add _, keyType, err = parsePrivateKey(key.Bytes) </s> remove pemblock := []byte(pkey)
for {
var decoded *pem.Block
decoded, pemblock = pem.Decode(pemblock)
if decoded == nil {
break
}
</s> add for decoded, pemblock := pem.Decode([]byte(pkey)); decoded != nil; { </s> remove if decoded.Type == "CERTIFICATE" {
certs = append(certs, decoded)
}
</s> add pool := x509.NewCertPool()
for _, cert := range others {
log.Info("tls: got an intermediate cert")
pool.AddCert(cert) </s> remove return errors.Error(
</s> add return "", errors.Error( | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls.go |
return "", errors.Error("no valid keys were found") | <mask> }
<mask> }
<mask>
<mask> if key == nil {
<mask> return errors.Error("no valid keys were found")
<mask> }
<mask>
<mask> _, keyType, err := parsePrivateKey(key.Bytes)
<mask> if err != nil {
<mask> return fmt.Errorf("parsing private key: %w", err)
</s> Pull request: 4898-redirect-https
Merge in DNS/adguard-home from 4898-redirect-https to master
Updates #4898.
Updates #4927.
Squashed commit of the following:
commit bc41b6cae7ede0f1235e3956ab49204af1c9f38d
Merge: 815e2991 ac7634da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 13:02:23 2022 +0300
Merge branch 'master' into 4898-redirect-https
commit 815e299137224fc3c7fd46924d7b936515b95d67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 12:58:28 2022 +0300
home: imp ip addr detection
commit 9d4ecd9ab0e13ef6c19c3b923363bff43394ea4c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 17:23:41 2022 +0300
home: imp cyclo
commit 86c47b68fe6e3916cec97eee5d34e3e6c18e4892
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 15:06:05 2022 +0300
all: imp text
commit bcc25697b551668d1dab53a874e716fcadd83f09
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 11:47:57 2022 +0300
home: fix test
commit bb51a74cb82eeaa977821fa7314810c7b8be55cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Oct 30 23:23:40 2022 +0300
home: imp code
commit 38522330691baf8475a59ed4f40b1d45363df1e3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 28 17:00:50 2022 +0300
home: imp code
commit 7284f7288feb7491560f0f5d2754044c7a9f603a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:42:57 2022 +0300
all: log changes
commit 540efcb013e15294b98efe581323f75ceefc8f5a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:24:21 2022 +0300
home: imp tls </s> remove _, keyType, err := parsePrivateKey(key.Bytes)
</s> add _, keyType, err = parsePrivateKey(key.Bytes) </s> remove return fmt.Errorf("parsing private key: %w", err)
</s> add return "", fmt.Errorf("parsing private key: %w", err) </s> remove return errors.Error(
</s> add return "", errors.Error( </s> remove _, err = tls.X509KeyPair(certChain, pkey)
if err != nil {
err = fmt.Errorf("certificate-key pair: %w", err)
status.WarningValidation = err.Error()
return err
</s> add _, pairErr := tls.X509KeyPair(certChain, pkey)
if pairErr != nil {
return fmt.Errorf("certificate-key pair: %w", pairErr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls.go |
_, keyType, err = parsePrivateKey(key.Bytes) | <mask> if key == nil {
<mask> return errors.Error("no valid keys were found")
<mask> }
<mask>
<mask> _, keyType, err := parsePrivateKey(key.Bytes)
<mask> if err != nil {
<mask> return fmt.Errorf("parsing private key: %w", err)
<mask> }
<mask>
<mask> if keyType == keyTypeED25519 {
</s> Pull request: 4898-redirect-https
Merge in DNS/adguard-home from 4898-redirect-https to master
Updates #4898.
Updates #4927.
Squashed commit of the following:
commit bc41b6cae7ede0f1235e3956ab49204af1c9f38d
Merge: 815e2991 ac7634da
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 13:02:23 2022 +0300
Merge branch 'master' into 4898-redirect-https
commit 815e299137224fc3c7fd46924d7b936515b95d67
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Tue Nov 1 12:58:28 2022 +0300
home: imp ip addr detection
commit 9d4ecd9ab0e13ef6c19c3b923363bff43394ea4c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 17:23:41 2022 +0300
home: imp cyclo
commit 86c47b68fe6e3916cec97eee5d34e3e6c18e4892
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 15:06:05 2022 +0300
all: imp text
commit bcc25697b551668d1dab53a874e716fcadd83f09
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Mon Oct 31 11:47:57 2022 +0300
home: fix test
commit bb51a74cb82eeaa977821fa7314810c7b8be55cb
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Sun Oct 30 23:23:40 2022 +0300
home: imp code
commit 38522330691baf8475a59ed4f40b1d45363df1e3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Fri Oct 28 17:00:50 2022 +0300
home: imp code
commit 7284f7288feb7491560f0f5d2754044c7a9f603a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:42:57 2022 +0300
all: log changes
commit 540efcb013e15294b98efe581323f75ceefc8f5a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 27 19:24:21 2022 +0300
home: imp tls </s> remove return errors.Error("no valid keys were found")
</s> add return "", errors.Error("no valid keys were found") </s> remove return fmt.Errorf("parsing private key: %w", err)
</s> add return "", fmt.Errorf("parsing private key: %w", err) </s> remove return errors.Error(
</s> add return "", errors.Error( </s> remove if decoded.Type == "CERTIFICATE" {
certs = append(certs, decoded)
}
</s> add pool := x509.NewCertPool()
for _, cert := range others {
log.Info("tls: got an intermediate cert")
pool.AddCert(cert) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.