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 |
|---|---|---|---|---|
log.Debug("IPSET: invalid value %q", it) | <mask> }
<mask>
<mask> ipsetNames := strings.Split(hostsAndNames[1], ",")
<mask> if len(ipsetNames) == 0 {
<mask> log.Debug("IPSET: invalid value '%s'", it)
<mask> continue
<mask> }
<mask> bad := false
<mask> for i := range ipsetNames {
<mask> ipsetNames[i] = strings.TrimSpace(ipsetNames... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/ipset.go |
log.Debug("IPSET: invalid value %q", it) | <mask> break
<mask> }
<mask> }
<mask> if bad {
<mask> log.Debug("IPSET: invalid value '%s'", it)
<mask> continue
<mask> }
<mask>
<mask> hosts := strings.Split(hostsAndNames[0], ",")
<mask> for _, host := range hosts {
</s> Pull request:* all: remove github.com/joomcode/errorx dependen... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/ipset.go |
log.Debug("IPSET: invalid value %q", it) | <mask> for _, host := range hosts {
<mask> host = strings.TrimSpace(host)
<mask> host = strings.ToLower(host)
<mask> if len(host) == 0 {
<mask> log.Debug("IPSET: invalid value '%s'", it)
<mask> continue
<mask> }
<mask> c.ipsetList[host] = ipsetNames
<mask> }
<mask> }
</s> Pull req... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/ipset.go |
log.Info("IPSET: ipset add: code:%d output:%q", code, out) | <mask> log.Info("IPSET: %s(%s) -> %s: %s", host, ipStr, name, err)
<mask> continue
<mask> }
<mask> if code != 0 {
<mask> log.Info("IPSET: ipset add: code:%d output:'%s'", code, out)
<mask> continue
<mask> }
<mask> log.Debug("IPSET: added %s(%s) -> %s", host, ipStr, name)
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/ipset.go |
log.Printf("Couldn't look up replacement host %q: %s", newAddr, err) | <mask> }
<mask>
<mask> err := s.dnsProxy.Resolve(newContext)
<mask> if err != nil {
<mask> log.Printf("Couldn't look up replacement host '%s': %s", newAddr, err)
<mask> return s.genServerFailure(request)
<mask> }
<mask>
<mask> resp := s.makeResponse(request)
<mask> if newContext.Res != nil {
</s>... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/msg.go |
const (
cookieTTL = 365 * 24 // in hours
sessionCookieName = "agh_session"
) | <mask> "go.etcd.io/bbolt"
<mask> "golang.org/x/crypto/bcrypt"
<mask> )
<mask>
<mask> const cookieTTL = 365 * 24 // in hours
<mask> const sessionCookieName = "agh_session"
<mask>
<mask> type session struct {
<mask> userName string
<mask> expire uint32 // expiration time (in seconds)
<mask> }
</s> Pul... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/auth.go |
a.db, err = bbolt.Open(dbFilename, 0o644, nil) | <mask> a.sessionTTL = sessionTTL
<mask> a.sessions = make(map[string]*session)
<mask> rand.Seed(time.Now().UTC().Unix())
<mask> var err error
<mask> a.db, err = bbolt.Open(dbFilename, 0644, nil)
<mask> if err != nil {
<mask> log.Error("Auth: open DB: %s: %s", dbFilename, err)
<mask> if err.Error() == ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/auth.go |
log.Info("Auth: invalid user name or password: name=%q", req.Name) | <mask> }
<mask>
<mask> cookie := Context.auth.httpCookie(req)
<mask> if len(cookie) == 0 {
<mask> log.Info("Auth: invalid user name or password: name='%s'", req.Name)
<mask> time.Sleep(1 * time.Second)
<mask> http.Error(w, "invalid user name or password", http.StatusBadRequest)
<mask> return
<mask>... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/auth.go |
log.Debug("Clients: skipping unknown blocked-service %q", s) | <mask> }
<mask>
<mask> for _, s := range cy.BlockedServices {
<mask> if !dnsfilter.BlockedSvcKnown(s) {
<mask> log.Debug("Clients: skipping unknown blocked-service '%s'", s)
<mask> continue
<mask> }
<mask> cli.BlockedServices = append(cli.BlockedServices, s)
<mask> }
<mask>
</s> Pull... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/clients.go |
log.Debug("Clients: skipping unknown tag %q", t) | <mask> }
<mask>
<mask> for _, t := range cy.Tags {
<mask> if !clients.tagKnown(t) {
<mask> log.Debug("Clients: skipping unknown tag '%s'", t)
<mask> continue
<mask> }
<mask> cli.Tags = append(cli.Tags, t)
<mask> }
<mask> sort.Strings(cli.Tags)
</s> Pull request:* all: remove github.... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/clients.go |
return fmt.Errorf("id required") | <mask> return fmt.Errorf("invalid Name")
<mask> }
<mask>
<mask> if len(c.IDs) == 0 {
<mask> return fmt.Errorf("ID required")
<mask> }
<mask>
<mask> for i, id := range c.IDs {
<mask> ip := net.ParseIP(id)
<mask> if ip != nil {
</s> Pull request:* all: remove github.com/joomcode/errorx dependency... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/clients.go |
return fmt.Errorf("invalid upstream servers: %w", err) | <mask> sort.Strings(c.Tags)
<mask>
<mask> err := dnsforward.ValidateUpstreams(c.Upstreams)
<mask> if err != nil {
<mask> return fmt.Errorf("invalid upstream servers: %s", err)
<mask> }
<mask>
<mask> return nil
<mask> }
<mask>
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Me... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/clients.go |
log.Debug("Clients: added %q: ID:%v [%d]", c.Name, c.IDs, len(clients.list)) | <mask> for _, id := range c.IDs {
<mask> clients.idIndex[id] = &c
<mask> }
<mask>
<mask> log.Debug("Clients: added '%s': ID:%v [%d]", c.Name, c.IDs, len(clients.list))
<mask> return true, nil
<mask> }
<mask>
<mask> // Del removes a client
<mask> func (clients *clientsContainer) Del(name string) bool {... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/clients.go |
log.Debug("Clients: added %q -> %q [%d]", ip, host, len(clients.ipHost)) | <mask> Source: source,
<mask> }
<mask> clients.ipHost[ip] = ch
<mask> }
<mask> log.Debug("Clients: added '%s' -> '%s' [%d]", ip, host, len(clients.ipHost))
<mask> return true, nil
<mask> }
<mask>
<mask> // Remove all entries that match the specified source
<mask> func (clients *clientsContainer) rm... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/clients.go |
const (
resolvedConfPath = "/etc/systemd/resolved.conf.d/adguardhome.conf"
resolvedConfData = `[Resolve] | <mask>
<mask> return true
<mask> }
<mask>
<mask> const resolvedConfPath = "/etc/systemd/resolved.conf.d/adguardhome.conf"
<mask> const resolvedConfData = `[Resolve]
<mask> DNS=127.0.0.1
<mask> DNSStubListener=no
<mask> `
<mask> const resolvConfPath = "/etc/resolv.conf"
<mask>
</s> Pull request:* all: re... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/control_install.go |
) | <mask> DNS=127.0.0.1
<mask> DNSStubListener=no
<mask> `
<mask> const resolvConfPath = "/etc/resolv.conf"
<mask>
<mask> // Deactivate DNSStubListener
<mask> func disableDNSStubListener() error {
<mask> dir := filepath.Dir(resolvedConfPath)
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/control_install.go |
err := os.MkdirAll(dir, 0o755) | <mask>
<mask> // Deactivate DNSStubListener
<mask> func disableDNSStubListener() error {
<mask> dir := filepath.Dir(resolvedConfPath)
<mask> err := os.MkdirAll(dir, 0755)
<mask> if err != nil {
<mask> return fmt.Errorf("os.MkdirAll: %s: %s", dir, err)
<mask> }
<mask>
<mask> err = ioutil.WriteFile(res... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/control_install.go |
return fmt.Errorf("os.MkdirAll: %s: %w", dir, err) | <mask> func disableDNSStubListener() error {
<mask> dir := filepath.Dir(resolvedConfPath)
<mask> err := os.MkdirAll(dir, 0755)
<mask> if err != nil {
<mask> return fmt.Errorf("os.MkdirAll: %s: %s", dir, err)
<mask> }
<mask>
<mask> err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644)
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/control_install.go |
err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0o644) | <mask> if err != nil {
<mask> return fmt.Errorf("os.MkdirAll: %s: %s", dir, err)
<mask> }
<mask>
<mask> err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644)
<mask> if err != nil {
<mask> return fmt.Errorf("ioutil.WriteFile: %s: %s", resolvedConfPath, err)
<mask> }
<mask>
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/control_install.go |
return fmt.Errorf("ioutil.WriteFile: %s: %w", resolvedConfPath, err) | <mask> }
<mask>
<mask> err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644)
<mask> if err != nil {
<mask> return fmt.Errorf("ioutil.WriteFile: %s: %s", resolvedConfPath, err)
<mask> }
<mask>
<mask> _ = os.Rename(resolvConfPath, resolvConfPath+".backup")
<mask> err = os.Symlink("/r... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/control_install.go |
return fmt.Errorf("os.Symlink: %s: %w", resolvConfPath, err) | <mask> _ = os.Rename(resolvConfPath, resolvConfPath+".backup")
<mask> err = os.Symlink("/run/systemd/resolve/resolv.conf", resolvConfPath)
<mask> if err != nil {
<mask> _ = os.Remove(resolvedConfPath) // remove the file we've just created
<mask> return fmt.Errorf("os.Symlink: %s: %s", resolvConfPath, err)
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/control_install.go |
<mask> "github.com/AdguardTeam/AdGuardHome/internal/stats"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/util"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/joomcode/errorx"
<mask> )
<mask>
<mask> // Called by other modules when configur... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/dns.go | |
return fmt.Errorf("dnsServer.Prepare: %w", err) | <mask> dnsConfig := generateServerConfig()
<mask> err = Context.dnsServer.Prepare(&dnsConfig)
<mask> if err != nil {
<mask> closeDNSServer()
<mask> return fmt.Errorf("dnsServer.Prepare: %s", err)
<mask> }
<mask>
<mask> Context.rdns = InitRDNS(Context.dnsServer, &Context.clients)
<mask> Context.whois... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/dns.go |
return false // software | <mask> ip4 := ip.To4()
<mask> if ip4 != nil {
<mask> switch ip4[0] {
<mask> case 0:
<mask> return false //software
<mask> case 10:
<mask> return false //private network
<mask> case 127:
<mask> return false //loopback
<mask> case 169:
</s> Pull request:* all: remove github.com/joomcode/er... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/dns.go |
return false // private network | <mask> switch ip4[0] {
<mask> case 0:
<mask> return false //software
<mask> case 10:
<mask> return false //private network
<mask> case 127:
<mask> return false //loopback
<mask> case 169:
<mask> if ip4[1] == 254 {
<mask> return false //link-local
</s> Pull request:* all: remove gith... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/dns.go |
return false // loopback | <mask> return false //software
<mask> case 10:
<mask> return false //private network
<mask> case 127:
<mask> return false //loopback
<mask> case 169:
<mask> if ip4[1] == 254 {
<mask> return false //link-local
<mask> }
<mask> case 172:
</s> Pull request:* all: remove github.com/joom... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/dns.go |
return false // link-local | <mask> case 127:
<mask> return false //loopback
<mask> case 169:
<mask> if ip4[1] == 254 {
<mask> return false //link-local
<mask> }
<mask> case 172:
<mask> if ip4[1] >= 16 && ip4[1] <= 31 {
<mask> return false //private network
<mask> }
</s> Pull request:* all: remove github.com... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/dns.go |
return false // private network | <mask> return false //link-local
<mask> }
<mask> case 172:
<mask> if ip4[1] >= 16 && ip4[1] <= 31 {
<mask> return false //private network
<mask> }
<mask> case 192:
<mask> if (ip4[1] == 0 && ip4[2] == 0) || //private network
<mask> (ip4[1] == 0 && ip4[2] == 2) || //documentation
<ma... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/dns.go |
if (ip4[1] == 0 && ip4[2] == 0) || // private network
(ip4[1] == 0 && ip4[2] == 2) || // documentation
(ip4[1] == 88 && ip4[2] == 99) || // reserved
(ip4[1] == 168) { // private network | <mask> if ip4[1] >= 16 && ip4[1] <= 31 {
<mask> return false //private network
<mask> }
<mask> case 192:
<mask> if (ip4[1] == 0 && ip4[2] == 0) || //private network
<mask> (ip4[1] == 0 && ip4[2] == 2) || //documentation
<mask> (ip4[1] == 88 && ip4[2] == 99) || //reserved
<mask> (ip4[1... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/dns.go |
if (ip4[1] == 18 || ip4[2] == 19) || // private network
(ip4[1] == 51 || ip4[2] == 100) { // documentation | <mask> (ip4[1] == 168) { //private network
<mask> return false
<mask> }
<mask> case 198:
<mask> if (ip4[1] == 18 || ip4[2] == 19) || //private network
<mask> (ip4[1] == 51 || ip4[2] == 100) { //documentation
<mask> return false
<mask> }
<mask> case 203:
<mask> if ip4[1] == 0 &&... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/dns.go |
if ip4[1] == 0 && ip4[2] == 113 { // documentation | <mask> (ip4[1] == 51 || ip4[2] == 100) { //documentation
<mask> return false
<mask> }
<mask> case 203:
<mask> if ip4[1] == 0 && ip4[2] == 113 { //documentation
<mask> return false
<mask> }
<mask> case 224:
<mask> if ip4[1] == 0 && ip4[2] == 0 { //multicast
<mask> return false
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/dns.go |
if ip4[1] == 0 && ip4[2] == 0 { // multicast | <mask> if ip4[1] == 0 && ip4[2] == 113 { //documentation
<mask> return false
<mask> }
<mask> case 224:
<mask> if ip4[1] == 0 && ip4[2] == 0 { //multicast
<mask> return false
<mask> }
<mask> case 255:
<mask> if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { //subnet
<mask> ret... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/dns.go |
if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { // subnet | <mask> if ip4[1] == 0 && ip4[2] == 0 { //multicast
<mask> return false
<mask> }
<mask> case 255:
<mask> if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { //subnet
<mask> return false
<mask> }
<mask> }
<mask> } else {
<mask> if ip.IsLoopback() || ip.IsLinkLocalMulticast() || ip.Is... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/dns.go |
return fmt.Errorf("couldn't start forwarding DNS server: %w", err) | <mask> Context.clients.Start()
<mask>
<mask> err := Context.dnsServer.Start()
<mask> if err != nil {
<mask> return errorx.Decorate(err, "Couldn't start forwarding DNS server")
<mask> }
<mask>
<mask> Context.dnsFilter.Start()
<mask> Context.filters.Start()
<mask> Context.stats.Start()
</s> Pull req... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/dns.go |
return fmt.Errorf("couldn't start forwarding DNS server: %w", err) | <mask> func reconfigureDNSServer() error {
<mask> newconfig := generateServerConfig()
<mask> err := Context.dnsServer.Reconfigure(&newconfig)
<mask> if err != nil {
<mask> return errorx.Decorate(err, "Couldn't start forwarding DNS server")
<mask> }
<mask>
<mask> return nil
<mask> }
<mask>
</s> Pull ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/dns.go |
return fmt.Errorf("couldn't stop forwarding DNS server: %w", err) | <mask> }
<mask>
<mask> err := Context.dnsServer.Stop()
<mask> if err != nil {
<mask> return errorx.Decorate(err, "Couldn't stop forwarding DNS server")
<mask> }
<mask>
<mask> closeDNSServer()
<mask> return nil
<mask> }
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/dns.go |
var nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID | <mask> "github.com/AdguardTeam/AdGuardHome/internal/util"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> var (
<mask> nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID
<mask> )
<mask>
<mask> // Filtering - module object
<mask> type Filtering struct {
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/filter.go |
_ = os.MkdirAll(filepath.Join(Context.getDataDir(), filterDir), 0o755) | <mask>
<mask> // Init - initialize the module
<mask> func (f *Filtering) Init() {
<mask> f.filterTitleRegexp = regexp.MustCompile(`^! Title: +(.*)$`)
<mask> _ = os.MkdirAll(filepath.Join(Context.getDataDir(), filterDir), 0755)
<mask> f.loadFilters(config.Filters)
<mask> f.loadFilters(config.WhitelistFilters... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/filter.go |
return false, fmt.Errorf("open file: %w", err) | <mask> var reader io.Reader
<mask> if filepath.IsAbs(filter.URL) {
<mask> f, err := os.Open(filter.URL)
<mask> if err != nil {
<mask> return false, fmt.Errorf("open file: %s", err)
<mask> }
<mask> defer f.Close()
<mask> reader = f
<mask> } else {
<mask> resp, err := Context.client.Get(filter... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/filter.go |
"github.com/AdguardTeam/AdGuardHome/internal/agherr" | <mask> "time"
<mask>
<mask> "gopkg.in/natefinch/lumberjack.v2"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/update"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/util"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/isdelve"
<mask>
<mask> "github.com/AdguardTeam/AdGuar... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/home.go |
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/update"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/util"
<mask>
<mask> "github.com/joomcode/errorx"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/isdelve"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/home.go | |
log.Info("Received signal %q", sig) | <mask> signal.Notify(Context.appSignalChannel, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP, syscall.SIGQUIT)
<mask> go func() {
<mask> for {
<mask> sig := <-Context.appSignalChannel
<mask> log.Info("Received signal '%s'", sig)
<mask> switch sig {
<mask> case syscall.SIGHUP:
<mask> Contex... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/home.go |
err := os.MkdirAll(Context.getDataDir(), 0o755) | <mask> }()
<mask> }
<mask> }
<mask>
<mask> err := os.MkdirAll(Context.getDataDir(), 0755)
<mask> if err != nil {
<mask> log.Fatalf("Cannot create DNS data dir at %s: %s", Context.getDataDir(), err)
<mask> }
<mask>
<mask> sessFilename := filepath.Join(Context.getDataDir(), "sessions.db")
</s> Pu... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/home.go |
if // noinspection ALL | <mask> if runtime.GOOS == "windows" {
<mask> // On Windows we need to have admin rights to run properly
<mask>
<mask> admin, _ := util.HaveAdminRights()
<mask> if //noinspection ALL
<mask> admin || isdelve.Enabled {
<mask> // Don't forget that for this to work you need to add "delve" tag explicitly
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/home.go |
err := ioutil.WriteFile(fn, []byte(data), 0o644) | <mask>
<mask> // Write PID to a file
<mask> func writePIDFile(fn string) bool {
<mask> data := fmt.Sprintf("%d", os.Getpid())
<mask> err := ioutil.WriteFile(fn, []byte(data), 0644)
<mask> if err != nil {
<mask> log.Error("Couldn't write PID to file %s: %v", fn, err)
<mask> return false
<mask> }
<mask... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/home.go |
_, err := os.OpenFile(logFilePath, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0o644) | <mask> if filepath.IsAbs(ls.LogFile) {
<mask> logFilePath = ls.LogFile
<mask> }
<mask>
<mask> _, err := os.OpenFile(logFilePath, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644)
<mask> if err != nil {
<mask> log.Fatalf("cannot create a log file: %s", err)
<mask> }
<mask>
<mask> log.SetOutput(&lu... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/home.go |
MaxAge: ls.LogMaxAge, // days | <mask> Compress: ls.LogCompress, // disabled by default
<mask> LocalTime: ls.LogLocalTime,
<mask> MaxBackups: ls.LogMaxBackups,
<mask> MaxSize: ls.LogMaxSize, // megabytes
<mask> MaxAge: ls.LogMaxAge, //days
<mask> })
<mask> }
<mask> }
<mask>
<mask> func cleanup() {
</s> Pull re... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/home.go |
return nil, agherr.Many(fmt.Sprintf("couldn't dial to %s", addr), dialErrs...) | <mask> continue
<mask> }
<mask> return con, err
<mask> }
<mask> return nil, errorx.DecorateMany(fmt.Sprintf("couldn't dial to %s", addr), dialErrs...)
<mask> }
<mask>
<mask> func getHTTPProxy(req *http.Request) (*url.URL, error) {
<mask> if len(config.ProxyURL) == 0 {
<mask> return nil, nil
</s>... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/home.go |
err = fmt.Errorf("port %q is not a number", v) | <mask> var err error
<mask> var p int
<mask> minPort, maxPort := 0, 1<<16-1
<mask> if p, err = strconv.Atoi(v); err != nil {
<mask> err = fmt.Errorf("port '%s' is not a number", v)
<mask> } else if p < minPort || p > maxPort {
<mask> err = fmt.Errorf("port %d not in range %d - %d", p, minPort, ma... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/options.go |
<mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/joomcode/errorx"
<mask> )
<mask>
<mask> var tlsWebHandlersRegistered = false
<mask>
<mask> // TLSMod - TLS module object
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/tls.go | |
return data, fmt.Errorf("failed to parse new TLS config json: %w", err) | <mask> func unmarshalTLS(r *http.Request) (tlsConfigSettings, error) {
<mask> data := tlsConfigSettings{}
<mask> err := json.NewDecoder(r.Body).Decode(&data)
<mask> if err != nil {
<mask> return data, errorx.Decorate(err, "Failed to parse new TLS config json")
<mask> }
<mask>
<mask> if data.CertificateC... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/tls.go |
return data, fmt.Errorf("failed to base64-decode certificate chain: %w", err) | <mask>
<mask> if data.CertificateChain != "" {
<mask> certPEM, err := base64.StdEncoding.DecodeString(data.CertificateChain)
<mask> if err != nil {
<mask> return data, errorx.Decorate(err, "Failed to base64-decode certificate chain")
<mask> }
<mask> data.CertificateChain = string(certPEM)
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/tls.go |
return data, fmt.Errorf("failed to base64-decode private key: %w", err) | <mask>
<mask> if data.PrivateKey != "" {
<mask> keyPEM, err := base64.StdEncoding.DecodeString(data.PrivateKey)
<mask> if err != nil {
<mask> return data, errorx.Decorate(err, "Failed to base64-decode private key")
<mask> }
<mask>
<mask> data.PrivateKey = string(keyPEM)
<mask> if data.PrivateKe... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/tls.go |
return fmt.Errorf("dns configuration is not a map") | <mask> for k, v := range v {
<mask> newDNSConfig[fmt.Sprint(k)] = v
<mask> }
<mask> default:
<mask> return fmt.Errorf("DNS configuration is not a map")
<mask> }
<mask>
<mask> // Replace bootstrap_dns value filed with new array contains old bootstrap_dns inside
<mask> if bootstrapDNS, ok := (newDN... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/upgrade.go |
return "", fmt.Errorf("whois: redirect loop") | <mask> }
<mask>
<mask> log.Debug("Whois: redirected to %s IP:%s", redir, target)
<mask> }
<mask> return "", fmt.Errorf("Whois: redirect loop")
<mask> }
<mask>
<mask> // Request WHOIS information
<mask> func (w *Whois) process(ip string) [][]string {
<mask> data := [][]string{}
</s> Pull request:* a... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/whois.go |
"github.com/AdguardTeam/AdGuardHome/internal/agherr" | <mask>
<mask> import (
<mask> "io"
<mask>
<mask> "github.com/joomcode/errorx"
<mask> )
<mask>
<mask> // QLogReader allows reading from multiple query log files in the reverse order.
<mask> //
<mask> // Please note that this is a stateful object.
</s> Pull request:* all: remove github.com/joomcode/errorx... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/querylog/qlog_reader.go |
return agherr.Many("Error while closing QLogReader", errs...) | <mask> }
<mask> }
<mask>
<mask> if len(errs) > 0 {
<mask> return errorx.DecorateMany("Error while closing QLogReader", errs...)
<mask> }
<mask>
<mask> return nil
<mask> }
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-depend... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/querylog/qlog_reader.go |
return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %w", u.VersionURL, err) | <mask> defer resp.Body.Close()
<mask> }
<mask>
<mask> if err != nil {
<mask> return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %s", u.VersionURL, err)
<mask> }
<mask>
<mask> body, err := ioutil.ReadAll(resp.Body)
<mask> if err != nil {
<mask> return VersionInfo{}, fmt.Errorf("updater: HTTP ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/check.go |
return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %w", u.VersionURL, err) | <mask> }
<mask>
<mask> body, err := ioutil.ReadAll(resp.Body)
<mask> if err != nil {
<mask> return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %s", u.VersionURL, err)
<mask> }
<mask>
<mask> u.versionJSON = body
<mask> u.versionCheckLastTime = time.Now()
<mask>
</s> Pull request:* all: remove ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/check.go |
return info, fmt.Errorf("version.json: %w", err) | <mask> info := VersionInfo{}
<mask> versionJSON := make(map[string]interface{})
<mask> err := json.Unmarshal(data, &versionJSON)
<mask> if err != nil {
<mask> return info, fmt.Errorf("version.json: %s", err)
<mask> }
<mask>
<mask> var ok1, ok2, ok3, ok4 bool
<mask> info.NewVersion, ok1 = versionJSON[... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/check.go |
return fmt.Errorf(".zip unpack failed: %w", err) | <mask> log.Debug("updater: unpacking the package")
<mask> if strings.HasSuffix(pkgNameOnly, ".zip") {
<mask> u.unpackedFiles, err = zipFileUnpack(u.packageName, u.updateDir)
<mask> if err != nil {
<mask> return fmt.Errorf(".zip unpack failed: %s", err)
<mask> }
<mask>
<mask> } else if strings.HasSu... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
return fmt.Errorf(".tar.gz unpack failed: %w", err) | <mask>
<mask> } else if strings.HasSuffix(pkgNameOnly, ".tar.gz") {
<mask> u.unpackedFiles, err = tarGzFileUnpack(u.packageName, u.updateDir)
<mask> if err != nil {
<mask> return fmt.Errorf(".tar.gz unpack failed: %s", err)
<mask> }
<mask>
<mask> } else {
<mask> return fmt.Errorf("unknown packag... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
return fmt.Errorf("copyFile() failed: %w", err) | <mask> func (u *Updater) check() error {
<mask> log.Debug("updater: checking configuration")
<mask> err := copyFile(u.ConfigName, filepath.Join(u.updateDir, "AdGuardHome.yaml"))
<mask> if err != nil {
<mask> return fmt.Errorf("copyFile() failed: %s", err)
<mask> }
<mask> cmd := exec.Command(u.updateExeNam... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
_ = os.Mkdir(u.backupDir, 0o755) | <mask> }
<mask>
<mask> func (u *Updater) backup() error {
<mask> log.Debug("updater: backing up the current configuration")
<mask> _ = os.Mkdir(u.backupDir, 0755)
<mask> err := copyFile(u.ConfigName, filepath.Join(u.backupDir, "AdGuardHome.yaml"))
<mask> if err != nil {
<mask> return fmt.Errorf("copyFile... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
return fmt.Errorf("copyFile() failed: %w", err) | <mask> log.Debug("updater: backing up the current configuration")
<mask> _ = os.Mkdir(u.backupDir, 0755)
<mask> err := copyFile(u.ConfigName, filepath.Join(u.backupDir, "AdGuardHome.yaml"))
<mask> if err != nil {
<mask> return fmt.Errorf("copyFile() failed: %s", err)
<mask> }
<mask>
<mask> // workdir/R... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
return fmt.Errorf("http request failed: %w", err) | <mask> // Download package file and save it to disk
<mask> func (u *Updater) downloadPackageFile(url string, filename string) error {
<mask> resp, err := u.Client.Get(url)
<mask> if err != nil {
<mask> return fmt.Errorf("HTTP request failed: %s", err)
<mask> }
<mask> if resp != nil && resp.Body != nil {
<... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
return fmt.Errorf("ioutil.ReadAll() failed: %w", err) | <mask>
<mask> log.Debug("updater: reading HTTP body")
<mask> body, err := ioutil.ReadAll(resp.Body)
<mask> if err != nil {
<mask> return fmt.Errorf("ioutil.ReadAll() failed: %s", err)
<mask> }
<mask>
<mask> _ = os.Mkdir(u.updateDir, 0755)
<mask>
<mask> log.Debug("updater: saving package to file")
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
_ = os.Mkdir(u.updateDir, 0o755) | <mask> if err != nil {
<mask> return fmt.Errorf("ioutil.ReadAll() failed: %s", err)
<mask> }
<mask>
<mask> _ = os.Mkdir(u.updateDir, 0755)
<mask>
<mask> log.Debug("updater: saving package to file")
<mask> err = ioutil.WriteFile(filename, body, 0644)
<mask> if err != nil {
<mask> return fmt.Errorf(... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
err = ioutil.WriteFile(filename, body, 0o644) | <mask>
<mask> _ = os.Mkdir(u.updateDir, 0755)
<mask>
<mask> log.Debug("updater: saving package to file")
<mask> err = ioutil.WriteFile(filename, body, 0644)
<mask> if err != nil {
<mask> return fmt.Errorf("ioutil.WriteFile() failed: %s", err)
<mask> }
<mask> return nil
<mask> }
</s> Pull request:* ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
return fmt.Errorf("ioutil.WriteFile() failed: %w", err) | <mask>
<mask> log.Debug("updater: saving package to file")
<mask> err = ioutil.WriteFile(filename, body, 0644)
<mask> if err != nil {
<mask> return fmt.Errorf("ioutil.WriteFile() failed: %s", err)
<mask> }
<mask> return nil
<mask> }
<mask>
<mask> // Unpack all files from .tar.gz file to the specified... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
return nil, fmt.Errorf("os.Open(): %w", err) | <mask> // Return the list of files (not directories) written
<mask> func tarGzFileUnpack(tarfile, outdir string) ([]string, error) {
<mask> f, err := os.Open(tarfile)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("os.Open(): %s", err)
<mask> }
<mask> defer func() {
<mask> _ = f.Close()
<mask> }... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
return nil, fmt.Errorf("gzip.NewReader(): %w", err) | <mask> }()
<mask>
<mask> gzReader, err := gzip.NewReader(f)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("gzip.NewReader(): %s", err)
<mask> }
<mask>
<mask> var files []string
<mask> var err2 error
<mask> tarReader := tar.NewReader(gzReader)
</s> Pull request:* all: remove github.com/joomc... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
err2 = fmt.Errorf("tarReader.Next(): %w", err) | <mask> err2 = nil
<mask> break
<mask> }
<mask> if err != nil {
<mask> err2 = fmt.Errorf("tarReader.Next(): %s", err)
<mask> break
<mask> }
<mask>
<mask> _, inputNameOnly := filepath.Split(header.Name)
<mask> if len(inputNameOnly) == 0 {
</s> Pull request:* all: remove github.com/joomco... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
err = os.Mkdir(outputName, os.FileMode(header.Mode&0o777)) | <mask>
<mask> outputName := filepath.Join(outdir, inputNameOnly)
<mask>
<mask> if header.Typeflag == tar.TypeDir {
<mask> err = os.Mkdir(outputName, os.FileMode(header.Mode&0777))
<mask> if err != nil && !os.IsExist(err) {
<mask> err2 = fmt.Errorf("os.Mkdir(%s): %s", outputName, err)
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
err2 = fmt.Errorf("os.Mkdir(%s): %w", outputName, err) | <mask>
<mask> if header.Typeflag == tar.TypeDir {
<mask> err = os.Mkdir(outputName, os.FileMode(header.Mode&0777))
<mask> if err != nil && !os.IsExist(err) {
<mask> err2 = fmt.Errorf("os.Mkdir(%s): %s", outputName, err)
<mask> break
<mask> }
<mask> log.Debug("updater: created directory %s... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
f, err := os.OpenFile(outputName, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.FileMode(header.Mode&0o777)) | <mask> log.Debug("updater: %s: unknown file type %d, skipping", inputNameOnly, header.Typeflag)
<mask> continue
<mask> }
<mask>
<mask> f, err := os.OpenFile(outputName, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.FileMode(header.Mode&0777))
<mask> if err != nil {
<mask> err2 = fmt.Errorf("os.OpenFile(... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
err2 = fmt.Errorf("os.OpenFile(%s): %w", outputName, err) | <mask> }
<mask>
<mask> f, err := os.OpenFile(outputName, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.FileMode(header.Mode&0777))
<mask> if err != nil {
<mask> err2 = fmt.Errorf("os.OpenFile(%s): %s", outputName, err)
<mask> break
<mask> }
<mask> _, err = io.Copy(f, tarReader)
<mask> if err != nil... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
err2 = fmt.Errorf("io.Copy(): %w", err) | <mask> }
<mask> _, err = io.Copy(f, tarReader)
<mask> if err != nil {
<mask> _ = f.Close()
<mask> err2 = fmt.Errorf("io.Copy(): %s", err)
<mask> break
<mask> }
<mask> err = f.Close()
<mask> if err != nil {
<mask> err2 = fmt.Errorf("f.Close(): %s", err)
</s> Pull request:* all: remove ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
err2 = fmt.Errorf("f.Close(): %w", err) | <mask> break
<mask> }
<mask> err = f.Close()
<mask> if err != nil {
<mask> err2 = fmt.Errorf("f.Close(): %s", err)
<mask> break
<mask> }
<mask>
<mask> log.Debug("updater: created file %s", outputName)
<mask> files = append(files, header.Name)
</s> Pull request:* all: remove github.com/j... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
return nil, fmt.Errorf("zip.OpenReader(): %w", err) | <mask> // Return the list of files (not directories) written
<mask> func zipFileUnpack(zipfile, outdir string) ([]string, error) {
<mask> r, err := zip.OpenReader(zipfile)
<mask> if err != nil {
<mask> return nil, fmt.Errorf("zip.OpenReader(): %s", err)
<mask> }
<mask> defer r.Close()
<mask>
<mask> var... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
err2 = fmt.Errorf("zip file Open(): %w", err) | <mask> var zr io.ReadCloser
<mask> for _, zf := range r.File {
<mask> zr, err = zf.Open()
<mask> if err != nil {
<mask> err2 = fmt.Errorf("zip file Open(): %s", err)
<mask> break
<mask> }
<mask>
<mask> fi := zf.FileInfo()
<mask> inputNameOnly := fi.Name()
</s> Pull request:* all: remove gi... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
err2 = fmt.Errorf("os.Mkdir(): %w", err) | <mask>
<mask> if fi.IsDir() {
<mask> err = os.Mkdir(outputName, fi.Mode())
<mask> if err != nil && !os.IsExist(err) {
<mask> err2 = fmt.Errorf("os.Mkdir(): %s", err)
<mask> break
<mask> }
<mask> log.Tracef("created directory %s", outputName)
<mask> continue
<mask> }
</s> Pull requ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
err2 = fmt.Errorf("os.OpenFile(): %w", err) | <mask> }
<mask>
<mask> f, err := os.OpenFile(outputName, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, fi.Mode())
<mask> if err != nil {
<mask> err2 = fmt.Errorf("os.OpenFile(): %s", err)
<mask> break
<mask> }
<mask> _, err = io.Copy(f, zr)
<mask> if err != nil {
<mask> _ = f.Close()
</s> Pull re... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
err2 = fmt.Errorf("io.Copy(): %w", err) | <mask> }
<mask> _, err = io.Copy(f, zr)
<mask> if err != nil {
<mask> _ = f.Close()
<mask> err2 = fmt.Errorf("io.Copy(): %s", err)
<mask> break
<mask> }
<mask> err = f.Close()
<mask> if err != nil {
<mask> err2 = fmt.Errorf("f.Close(): %s", err)
</s> Pull request:* all: remove github.... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
err2 = fmt.Errorf("f.Close(): %w", err) | <mask> break
<mask> }
<mask> err = f.Close()
<mask> if err != nil {
<mask> err2 = fmt.Errorf("f.Close(): %s", err)
<mask> break
<mask> }
<mask>
<mask> log.Tracef("created file %s", outputName)
<mask> files = append(files, inputNameOnly)
</s> Pull request:* all: remove github.com/joomcod... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
e = ioutil.WriteFile(dst, d, 0o644) | <mask> d, e := ioutil.ReadFile(src)
<mask> if e != nil {
<mask> return e
<mask> }
<mask> e = ioutil.WriteFile(dst, d, 0644)
<mask> if e != nil {
<mask> return e
<mask> }
<mask> return nil
<mask> }
</s> Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
<mask> "syscall"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask>
<mask> "github.com/joomcode/errorx"
<mask> )
<mask>
<mask> // NetInterface represents a list of network interfaces
<mask> type NetInterface struct {
<mask> Name string // Network interface name
</s> Pul... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/util/network_utils.go | |
return nil, fmt.Errorf("couldn't get list of interfaces: %w", err) | <mask> // invalid interface is a ppp interface or the one that doesn't allow broadcasts
<mask> func GetValidNetInterfaces() ([]net.Interface, error) {
<mask> ifaces, err := net.Interfaces()
<mask> if err != nil {
<mask> return nil, fmt.Errorf("couldn't get list of interfaces: %s", err)
<mask> }
<mask>
<ma... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/util/network_utils.go |
return nil, fmt.Errorf("couldn't get interfaces: %w", err) | <mask> // we do not return link-local addresses here
<mask> func GetValidNetInterfacesForWeb() ([]NetInterface, error) {
<mask> ifaces, err := GetValidNetInterfaces()
<mask> if err != nil {
<mask> return nil, errorx.Decorate(err, "Couldn't get interfaces")
<mask> }
<mask> if len(ifaces) == 0 {
<mask> re... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/util/network_utils.go |
addrs, err := iface.Addrs()
if err != nil {
return nil, fmt.Errorf("failed to get addresses for interface %s: %w", iface.Name, err) | <mask>
<mask> var netInterfaces []NetInterface
<mask>
<mask> for _, iface := range ifaces {
<mask> addrs, e := iface.Addrs()
<mask> if e != nil {
<mask> return nil, errorx.Decorate(e, "Failed to get addresses for interface %s", iface.Name)
<mask> }
<mask>
<mask> netIface := NetInterface{
<mas... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/util/network_utils.go |
<mask> dnsProxy *proxy.Proxy // DNS proxy instance
<mask> dnsFilter *dnsfilter.Dnsfilter // DNS filter instance
<mask> queryLog *queryLog // Query log instance
<mask> stats *stats // General server statistics
<mask> once sync.Once
<mask>
<mask> AllowedClients ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2bbd2629682d003791ada3b584a8fd2d46a40ff9 | dnsforward/dnsforward.go | |
// Note: this function must be called only once | <mask> // NewServer creates a new instance of the dnsforward.Server
<mask> // baseDir is the base directory for query logs
<mask> func NewServer(baseDir string) *Server {
<mask> s := &Server{
<mask> queryLog: newQueryLog(baseDir),
<mask> stats: newStats(),
<mask> }
</s> * dnsforward: move initializatio... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2bbd2629682d003791ada3b584a8fd2d46a40ff9 | dnsforward/dnsforward.go |
s := &Server{ | <mask>
<mask> // NewServer creates a new instance of the dnsforward.Server
<mask> // baseDir is the base directory for query logs
<mask> func NewServer(baseDir string) *Server {
<mask> return &Server{
<mask> queryLog: newQueryLog(baseDir),
<mask> stats: newStats(),
<mask> }
<mask> }
<mask>
</s> * ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2bbd2629682d003791ada3b584a8fd2d46a40ff9 | dnsforward/dnsforward.go |
log.Tracef("Loading stats from querylog")
err := s.queryLog.fillStatsFromQueryLog(s.stats)
if err != nil {
log.Error("failed to load stats from querylog: %s", err)
}
log.Printf("Start DNS server periodic jobs")
go s.queryLog.periodicQueryLogRotate()
go s.queryLog.runningTop.periodicHourlyTopRotate()
go s.sta... | <mask> stats: newStats(),
<mask> }
<mask> }
<mask>
<mask> // FilteringConfig represents the DNS filtering configuration of AdGuard Home
<mask> // The zero FilteringConfig is empty and ready for use.
<mask> type FilteringConfig struct {
<mask> ProtectionEnabled bool `yaml:"protection_enabled"` // ... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2bbd2629682d003791ada3b584a8fd2d46a40ff9 | dnsforward/dnsforward.go |
<mask> if s.dnsFilter != nil || s.dnsProxy != nil {
<mask> return errors.New("DNS server is already started")
<mask> }
<mask>
<mask> if s.queryLog == nil {
<mask> s.queryLog = newQueryLog(".")
<mask> }
<mask>
<mask> if s.stats == nil {
<mask> s.stats = newStats()
<mask> }
<mask>
<mask> err ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2bbd2629682d003791ada3b584a8fd2d46a40ff9 | dnsforward/dnsforward.go | |
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> log.Tracef("Loading stats from querylog")
<mask> err = s.queryLog.fillStatsFromQueryLog(s.stats)
<mask> if err != nil {
<mask> return errorx.Decorate(err, "failed to load stats from querylog")
<mask> }
<mask>
<mask> // TODO: Think a... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2bbd2629682d003791ada3b584a8fd2d46a40ff9 | dnsforward/dnsforward.go | |
command: AdGuardHome -w $SNAP_DATA --no-check-update | <mask> publish: false
<mask> license: GPL-3.0
<mask> apps:
<mask> adguard-home:
<mask> args: -w ${SNAP_DATA} --no-check-update
<mask> plugs: [ network-bind ]
<mask> daemon: simple
<mask>
<mask> checksum:
<mask> name_template: 'checksums.txt'
</s> Fix project name,... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2bbffffcfc875558eddf590b3185b968ff969ede | .goreleaser.yml |
RELEASE_VERSION=$(TAG_NAME) | <mask>
<mask> # Version properties
<mask> COMMIT=$(shell git rev-parse --short HEAD)
<mask> TAG_NAME=$(shell git describe --abbrev=0)
<mask>
<mask> # Remove leading "v" from the tag name
<mask> RELEASE_VERSION=$(TAG_NAME:v%=%)
<mask> SNAPSHOT_VERSION=$(RELEASE_VERSION)-SNAPSHOT-$(COMMIT)
<mask>
<mask> # Se... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2bbffffcfc875558eddf590b3185b968ff969ede | Makefile |
# Overwrite the "version" tag when we push to the edge channel
DOCKER_TAGS := --tag $(DOCKER_IMAGE_NAME):edge | <mask> ifeq ($(CHANNEL),beta)
<mask> DOCKER_TAGS := $(DOCKER_TAGS) --tag $(DOCKER_IMAGE_NAME):beta
<mask> endif
<mask> ifeq ($(CHANNEL),edge)
<mask> DOCKER_TAGS := $(DOCKER_TAGS) --tag $(DOCKER_IMAGE_NAME):edge
<mask> endif
<mask> endif
<mask>
<mask> # Validate docker build arguments
<mask> ifndef DO... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2bbffffcfc875558eddf590b3185b968ff969ede | Makefile |
echo "version=$(version)" > $(DIST_DIR)/version.txt | <mask> @echo Writing version file: $(version)
<mask>
<mask> # Variables for CI
<mask> rm -f $(DIST_DIR)/version.txt
<mask> echo "version=v$(version)" > $(DIST_DIR)/version.txt
<mask>
<mask> # Prepare the version.json file
<mask> rm -f $(DIST_DIR)/version.json
<mask> echo "{" >> $(DIST_DIR)/version.jso... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/2bbffffcfc875558eddf590b3185b968ff969ede | Makefile |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.