docstring_tokens stringlengths 18 16.9k | code_tokens stringlengths 75 1.81M | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|
keep keep keep keep replace replace keep keep keep keep keep | <mask>
<mask> log.Info("tls: number of certs: %d", len(parsedCerts))
<mask>
<mask> if !aghtls.CertificateHasIP(parsedCerts[0]) {
<mask> err = errors.Error(`certificate has no IP addresses` +
<mask> `, this may cause issues with DNS-over-TLS clients`)
<mask> }
<mask>
<mask> return parsedCerts, true,... | https://github.com/AdguardTeam/AdGuardHome/commit/08282dc4d9958d8a2ac6163d6d0921517ec45f92 | internal/home/tls.go |
keep keep keep replace keep keep keep keep keep | <mask> 'name': 'build'
<mask>
<mask> 'env':
<mask> 'GO_VERSION': '1.18'
<mask> 'NODE_VERSION': '14'
<mask>
<mask> 'on':
<mask> 'push':
<mask> 'branches':
</s> all: use precise go version in github workflows </s> remove 'GO_VERSION': '1.18'
</s> add 'GO_VERSION': '1.18.6' </s> remove 'us... | https://github.com/AdguardTeam/AdGuardHome/commit/08799e9d0a335046f315977aefc4e468b60fddc0 | .github/workflows/build.yml |
keep keep keep keep replace keep keep keep keep keep | <mask> 'uses': 'actions/checkout@v2'
<mask> 'with':
<mask> 'fetch-depth': 0
<mask> - 'name': 'Set up Go'
<mask> 'uses': 'actions/setup-go@v2'
<mask> 'with':
<mask> 'go-version': '${{ env.GO_VERSION }}'
<mask> - 'name': 'Set up Node'
<mask> 'uses': 'actions/... | https://github.com/AdguardTeam/AdGuardHome/commit/08799e9d0a335046f315977aefc4e468b60fddc0 | .github/workflows/build.yml |
keep keep keep keep replace keep keep keep keep keep | <mask> 'uses': 'actions/checkout@v2'
<mask> 'with':
<mask> 'fetch-depth': 0
<mask> - 'name': 'Set up Go'
<mask> 'uses': 'actions/setup-go@v2'
<mask> 'with':
<mask> 'go-version': '${{ env.GO_VERSION }}'
<mask> - 'name': 'Set up Node'
<mask> 'uses': 'actions/... | https://github.com/AdguardTeam/AdGuardHome/commit/08799e9d0a335046f315977aefc4e468b60fddc0 | .github/workflows/build.yml |
keep keep keep replace keep keep keep keep keep | <mask> 'name': 'lint'
<mask>
<mask> 'env':
<mask> 'GO_VERSION': '1.18'
<mask>
<mask> 'on':
<mask> 'push':
<mask> 'tags':
<mask> - 'v*'
</s> all: use precise go version in github workflows </s> remove 'GO_VERSION': '1.18'
</s> add 'GO_VERSION': '1.18.6' </s> remove 'uses': 'actions/set... | https://github.com/AdguardTeam/AdGuardHome/commit/08799e9d0a335046f315977aefc4e468b60fddc0 | .github/workflows/lint.yml |
keep keep keep keep replace keep keep keep keep keep | <mask> 'runs-on': 'ubuntu-latest'
<mask> 'steps':
<mask> - 'uses': 'actions/checkout@v2'
<mask> - 'name': 'Set up Go'
<mask> 'uses': 'actions/setup-go@v2'
<mask> 'with':
<mask> 'go-version': '${{ env.GO_VERSION }}'
<mask> - 'name': 'run-lint'
<mask> 'run': >
<mask... | https://github.com/AdguardTeam/AdGuardHome/commit/08799e9d0a335046f315977aefc4e468b60fddc0 | .github/workflows/lint.yml |
keep keep keep keep replace keep keep keep keep keep | <mask> go 1.16
<mask>
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.39.8
<mask> github.com/AdguardTeam/golibs v0.9.3
<mask> github.com/AdguardTeam/urlfilter v0.14.6
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/ameshkov/dnscrypt/v2 v2.2.2
<mask> github.com/digineo/go-ipset/... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | go.mod |
keep keep keep keep replace keep keep keep keep keep | <mask> github.com/stretchr/testify v1.7.0
<mask> github.com/ti-mo/netfilter v0.4.0
<mask> go.etcd.io/bbolt v1.3.6
<mask> golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
<mask> golang.org/x/net v0.0.0-20210825183410-e898025ed96a
<mask> golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e
<mask> gopkg... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | go.mod |
keep keep keep keep replace replace keep keep keep keep keep | <mask> github.com/AdguardTeam/dnsproxy v0.39.8/go.mod h1:eDpJKAdkHORRwAedjuERv+7SWlcz4cn+5uwrbUAWHRY=
<mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.co... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | go.sum |
keep keep keep keep replace replace keep keep keep keep keep | <mask> golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
<mask> golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
<mask> golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | go.sum |
keep keep keep keep replace keep keep keep keep keep | <mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
<mask> golang.org/x/text ... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | go.sum |
keep keep keep add keep keep keep keep | <mask> golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
<mask> golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
<mask> golang.org/x/text ... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | go.sum |
keep add keep keep keep keep keep keep | <mask> "github.com/AdguardTeam/golibs/netutil"
<mask> "github.com/AdguardTeam/golibs/stringutil"
<mask> "github.com/go-ping/ping"
<mask> "github.com/insomniacslk/dhcp/dhcpv4"
<mask> "github.com/insomniacslk/dhcp/dhcpv4/server4"
<mask> "github.com/mdlayher/raw"
<mask> )
<mask>
</s> Pull request: upd goli... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/dhcpd/v4.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> s.leasedOffsets = newBitSet()
<mask>
<mask> if conf.LeaseDuration == 0 {
<mask> s.conf.leaseTime = time.Hour * 24
<mask> s.conf.LeaseDuration = uint32(s.conf.leaseTime.Seconds())
<mask> } else {
<mask> s.conf.leaseTime = time.Second * time.Duration(conf.LeaseDuration)
<mask> }
<mask>... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/dhcpd/v4.go |
keep add keep keep keep keep keep | <mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/golibs/netutil"
<mask> "github.com/insomniacslk/dhcp/dhcpv6"
<mask> "github.com/insomniacslk/dhcp/dhcpv6/server6"
<mask> "github.com/insomniacslk/dhcp/iana"
<mask> )
<mask>
</s> Pull request: upd golibs, use timeutil
Merge in DNS/a... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/dhcpd/v6.go |
keep keep keep keep replace keep keep keep keep keep | <mask> return s, fmt.Errorf("dhcpv6: invalid range-start IP: %s", conf.RangeStart)
<mask> }
<mask>
<mask> if conf.LeaseDuration == 0 {
<mask> s.conf.leaseTime = time.Hour * 24
<mask> s.conf.LeaseDuration = uint32(s.conf.leaseTime.Seconds())
<mask> } else {
<mask> s.conf.leaseTime = time.Second * tim... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/dhcpd/v6.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "sort"
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtime"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTea... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/dnsforward/config.go |
keep keep add keep keep keep keep | <mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/golibs/netutil"
<mask> "github.com/AdguardTeam/golibs/stringutil"
<mask> "github.com/ameshkov/dnscrypt/v2"
<mask> )
<mask>
<mask> // BlockingMode is an enum of all allowed blocking modes.
</s> Pull request: upd golibs, use timeutil
... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/dnsforward/config.go |
keep keep keep keep replace keep keep keep keep keep | <mask> AllServers bool `yaml:"all_servers"` // if true, parallel queries to all configured upstream servers are enabled
<mask> FastestAddr bool `yaml:"fastest_addr"` // use Fastest Address algorithm
<mask> // FastestTimeout replaces the default timeout for dialing IP addresses
<mask> ... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/dnsforward/config.go |
keep keep add keep keep keep keep | <mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/miekg/dns"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
</s> Pull request: upd golibs, use ... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/dnsforward/dnsforward_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> serialNumber, err := rand.Int(rand.Reader, serialNumberLimit)
<mask> require.NoErrorf(t, err, "failed to generate serial number: %s", err)
<mask>
<mask> notBefore := time.Now()
<mask> notAfter := notBefore.Add(5 * 365 * time.Hour * 24)
<mask>
<mask> template := x509.Certificate{
<mask> SerialNum... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/dnsforward/dnsforward_test.go |
keep add keep keep keep keep | <mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/golibs/netutil"
<mask> "go.etcd.io/bbolt"
<mask> "golang.org/x/crypto/bcrypt"
<mask> )
<mask>
</s> Pull request: upd golibs, use timeutil
Merge in DNS/adguard-home from use-timeutil to master
Squashed commit of the following:
commi... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/home/auth.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "golang.org/x/crypto/bcrypt"
<mask> )
<mask>
<mask> // cookieTTL is the time-to-live of the session cookie.
<mask> const cookieTTL = 365 * 24 * time.Hour
<mask>
<mask> // sessionCookieName is the name of the session cookie.
<mask> const sessionCookieName = "agh_session"
<mask>
<mask> // sessionToke... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/home/auth.go |
keep replace keep replace keep keep keep | <mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtime"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
</s> Pull request: upd ... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/home/config.go |
keep add keep keep keep keep keep | <mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/google/renameio/maybe"
<mask> yaml "gopkg.in/yaml.v2"
<mask> )
<mask>
<mask> const (
</s> Pull request: upd golibs, use timeutil
Merge in DNS/adguard-home from use-timeutil to master
Squashed commi... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/home/config.go |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask>
<mask> QueryLogEnabled bool `yaml:"querylog_enabled"` // if true, query log is enabled
<mask> QueryLogFileEnabled bool `yaml:"querylog_file_enabled"` // if true, query log will be written to a file
<mask> // QueryLogInterval is the interval for query log's files rotation.
<mask> QueryLogInterv... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/home/config.go |
keep keep keep keep replace keep keep keep keep keep | <mask> FiltersUpdateIntervalHours uint32 `yaml:"filters_update_interval"` // time period to update filters (in hours)
<mask> DnsfilterConf filtering.Config `yaml:",inline"`
<mask>
<mask> // UpstreamTimeout is the timeout for querying upstream servers.
<mask> UpstreamTimeout aghtime.Dura... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/home/config.go |
keep keep keep keep replace keep keep keep keep keep | <mask> BlockedResponseTTL: 10, // in seconds
<mask> Ratelimit: 20,
<mask> RefuseAny: true,
<mask> AllServers: false,
<mask> FastestTimeout: aghtime.Duration{
<mask> Duration: fastip.DefaultPingWaitTimeout,
<mask> },
<mask>
<mask> TrustedProxies: []stri... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/home/config.go |
keep keep keep keep replace keep keep keep keep keep | <mask> MaxGoroutines: 300,
<mask> },
<mask> FilteringEnabled: true, // whether or not use filter lists
<mask> FiltersUpdateIntervalHours: 24,
<mask> UpstreamTimeout: aghtime.Duration{Duration: dnsforward.DefaultTimeout},
<mask> LocalDomainName: "lan",
<mask> Resolve... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/home/config.go |
keep keep keep keep replace keep keep keep keep keep | <mask> config.WebSessionTTLHours = 30 * 24
<mask>
<mask> config.DNS.QueryLogEnabled = true
<mask> config.DNS.QueryLogFileEnabled = true
<mask> config.DNS.QueryLogInterval = aghtime.Duration{Duration: 90 * 24 * time.Hour}
<mask> config.DNS.QueryLogMemSize = 1000
<mask>
<mask> config.DNS.CacheSize = 4 * 1... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/home/config.go |
keep keep keep keep replace keep keep keep keep keep | <mask> config.DNS.FiltersUpdateIntervalHours = 24
<mask> }
<mask>
<mask> if config.DNS.UpstreamTimeout.Duration == 0 {
<mask> config.DNS.UpstreamTimeout = aghtime.Duration{Duration: dnsforward.DefaultTimeout}
<mask> }
<mask>
<mask> return nil
<mask> }
<mask>
</s> Pull request: upd golibs, use time... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/home/config.go |
keep keep keep keep replace keep keep keep keep keep | <mask> dc := querylog.Config{}
<mask> Context.queryLog.WriteDiskConfig(&dc)
<mask> config.DNS.QueryLogEnabled = dc.Enabled
<mask> config.DNS.QueryLogFileEnabled = dc.FileEnabled
<mask> config.DNS.QueryLogInterval = aghtime.Duration{Duration: dc.RotationIvl}
<mask> config.DNS.QueryLogMemSize = dc.MemSi... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/home/config.go |
keep keep keep keep replace keep keep keep keep keep | <mask> "strconv"
<mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtime"
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/golibs/netutil"
<mask> "github.com/google/renameio/maybe"
<mask> ... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/home/upgrade.go |
keep keep add keep keep keep keep keep keep | <mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/golibs/netutil"
<mask> "github.com/google/renameio/maybe"
<mask> "golang.org/x/crypto/bcrypt"
<mask> yaml "gopkg.in/yaml.v2"
<mask> )
<mask>
<mask> // currentSchemaVersion is the curre... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/home/upgrade.go |
keep keep keep keep replace keep keep keep keep keep | <mask> return fmt.Errorf("unexpected type of %s: %T", field, qlogIvlVal)
<mask> }
<mask> }
<mask>
<mask> dns[field] = aghtime.Duration{Duration: time.Duration(qlogIvl) * 24 * time.Hour}
<mask>
<mask> return nil
<mask> }
<mask>
<mask> // TODO(a.garipov): Replace with log.Output when we port it to ou... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/home/upgrade.go |
keep keep keep keep replace keep keep keep keep keep | <mask> import (
<mask> "testing"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtime"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> // TODO(a.garipov): Cover all migrations, use a testdata/ dir.
</s> Pull re... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/home/upgrade_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> wantErr string
<mask> name string
<mask> }{{
<mask> ivl: 1,
<mask> want: aghtime.Duration{Duration: 24 * time.Hour},
<mask> wantErr: "",
<mask> name: "success",
<mask> }, {
<mask> ivl: 0.25,
<mask> want: 0,
</s> Pull request: upd golibs, use timeutil
Merge in DNS... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/home/upgrade_test.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> var newDNSConf yobj
<mask> newDNSConf, ok = dnsVal.(yobj)
<mask> require.True(t, ok)
<mask>
<mask> var newIvl aghtime.Duration
<mask> newIvl, ok = newDNSConf["querylog_interval"].(aghtime.Duration)
<mask> require.True(t, ok)
<mask>
<mask> assert.Equal(t, tc.want, newIvl)
<mask> ... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/home/upgrade_test.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> var ivl interface{}
<mask> ivl, ok = dnsVal["querylog_interval"]
<mask> require.True(t, ok)
<mask>
<mask> var ivlVal aghtime.Duration
<mask> ivlVal, ok = ivl.(aghtime.Duration)
<mask> require.True(t, ok)
<mask>
<mask> assert.Equal(t, 90*24*time.Hour, ivlVal.Duration)
<mask> })
<mask> ... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/home/upgrade_test.go |
keep keep keep add keep keep keep keep | <mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> const (
</s> Pull request: upd golibs, use timeutil
Merge in DNS/adguard-home from use-timeu... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/querylog/qlog.go |
keep keep keep keep replace replace replace replace replace keep keep keep keep keep | <mask>
<mask> func checkInterval(ivl time.Duration) (ok bool) {
<mask> // The constants for possible values of query log's rotation interval.
<mask> const (
<mask> quarterDay = 6 * time.Hour
<mask> day = 24 * time.Hour
<mask> week = day * 7
<mask> month = day * 30
<mask> thre... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/querylog/qlog.go |
keep keep add keep keep keep keep keep keep | <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "github.com/AdguardTeam/dnsproxy/proxyutil"
<mask> "github.com/miekg/dns"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<ma... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/querylog/qlog_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> func TestQueryLog(t *testing.T) {
<mask> l := newQueryLog(Config{
<mask> Enabled: true,
<mask> FileEnabled: true,
<mask> RotationIvl: 24 * time.Hour,
<mask> MemSize: 100,
<mask> BaseDir: t.TempDir(),
<mask> })
<mask>
<mask> // Add disk entries.
</s> Pull request: upd golibs, ... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/querylog/qlog_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> func TestQueryLogOffsetLimit(t *testing.T) {
<mask> l := newQueryLog(Config{
<mask> Enabled: true,
<mask> RotationIvl: 24 * time.Hour,
<mask> MemSize: 100,
<mask> BaseDir: t.TempDir(),
<mask> })
<mask>
<mask> const (
</s> Pull request: upd golibs, use timeutil
Merge in... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/querylog/qlog_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> func TestQueryLogMaxFileScanEntries(t *testing.T) {
<mask> l := newQueryLog(Config{
<mask> Enabled: true,
<mask> FileEnabled: true,
<mask> RotationIvl: 24 * time.Hour,
<mask> MemSize: 100,
<mask> BaseDir: t.TempDir(),
<mask> })
<mask>
<mask> const entNum = 10
</s> Pull reques... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/querylog/qlog_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask> func TestQueryLogFileDisabled(t *testing.T) {
<mask> l := newQueryLog(Config{
<mask> Enabled: true,
<mask> FileEnabled: false,
<mask> RotationIvl: 24 * time.Hour,
<mask> MemSize: 2,
<mask> BaseDir: t.TempDir(),
<mask> })
<mask>
<mask> addEntry(l, "example1.org", net.IPv4(1, 1,... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/querylog/qlog_test.go |
keep keep keep add keep keep keep keep | <mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/filtering"
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> // QueryLog - main interface
</s> Pull request: upd golibs, use timeutil
Merge in DNS/adguar... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/querylog/querylog.go |
keep keep keep keep replace keep keep keep keep | <mask> log.Info(
<mask> "querylog: warning: unsupported rotation interval %d, setting to 1 day",
<mask> conf.RotationIvl,
<mask> )
<mask> l.conf.RotationIvl = 24 * time.Hour
<mask> }
<mask>
<mask> return l
<mask> }
</s> Pull request: upd golibs, use timeutil
Merge in DNS/adguard-home from use-... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/querylog/querylog.go |
keep add keep keep keep keep keep keep | <mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> // flushLogBuffer flushes the current buffer to file and resets the current buffer
<mask> func (l *queryLog) flushLogBuffer(fullFlush bool) error {
<mask> if !l.conf.FileEnabled {
<mask> return ... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/querylog/querylogfile.go |
keep keep keep keep replace keep keep | <mask> }
<mask> }
<mask>
<mask> // What?
<mask> time.Sleep(24 * time.Hour)
<mask> }
<mask> }
</s> Pull request: upd golibs, use timeutil
Merge in DNS/adguard-home from use-timeutil to master
Squashed commit of the following:
commit 28defb577b2b00efa448f63fe6a0cc468aa53164
Author: Eugene Burkov <E.... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/querylog/querylogfile.go |
keep keep add keep keep keep keep keep keep | <mask> "testing"
<mask> "time"
<mask>
<mask> "github.com/miekg/dns"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> func TestQueryLog_Search_findClient(t *testing.T) {
</s> Pull request: upd golibs, use timeutil
Merge in DNS/adguard-home ... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/querylog/search_test.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> l := newQueryLog(Config{
<mask> FindClient: findClient,
<mask> BaseDir: t.TempDir(),
<mask> RotationIvl: 24 * time.Hour,
<mask> MemSize: 100,
<mask> Enabled: true,
<mask> FileEnabled: true,
<mask> AnonymizeClientIP: false,
<mask> ... | https://github.com/AdguardTeam/AdGuardHome/commit/08ec3f604ea5ed5a9a7fa443ce64e25468ccaecb | internal/querylog/search_test.go |
keep keep keep add keep keep keep keep keep | <mask>
<mask> for {
<mask> ok, next, err := tryConn(req, c, iface)
<mask> if next {
<mask> continue
<mask> }
<mask> if ok {
<mask> return true, nil
<mask> }
</s> Pull request: dhcpd: fix possible infinite loop, set timeouts better
Merge in DNS/adguard-home from 2301-dhcp-check to master
Cl... | https://github.com/AdguardTeam/AdGuardHome/commit/09196118e9f5f089dc09e792f040bdc97fcc7432 | internal/dhcpd/check_other_dhcp.go |
keep keep keep keep replace keep keep keep keep keep | <mask> if ok {
<mask> return true, nil
<mask> }
<mask> if err != nil {
<mask> log.Debug("%s", err)
<mask> }
<mask> }
<mask> }
<mask>
<mask> // TODO(a.garipov): Refactor further. Inspect error handling, remove the next
</s> Pull request: dhcpd: fix possible infinite loop, set timeouts better
... | https://github.com/AdguardTeam/AdGuardHome/commit/09196118e9f5f089dc09e792f040bdc97fcc7432 | internal/dhcpd/check_other_dhcp.go |
keep keep keep keep replace keep keep keep keep keep | <mask> // progressively longer timeouts.
<mask> log.Tracef("waiting %v for an answer", defaultDiscoverTime)
<mask>
<mask> b := make([]byte, 1500)
<mask> _ = c.SetReadDeadline(time.Now().Add(defaultDiscoverTime))
<mask> n, _, err := c.ReadFrom(b)
<mask> if err != nil {
<mask> if isTimeout(err) {
<mask>... | https://github.com/AdguardTeam/AdGuardHome/commit/09196118e9f5f089dc09e792f040bdc97fcc7432 | internal/dhcpd/check_other_dhcp.go |
keep keep replace keep keep keep keep replace | <mask>
<mask> const coreDNSConfigTemplate = `. {
<mask> {{if .FilteringEnabled}}dnsfilter {{.FilterFile}} {
<mask> {{if .SafeBrowsingEnabled}}safebrowsing{{end}}
<mask> {{if .ParentalEnabled}}parental {{.ParentalSensitivity}}{{end}}
<mask> {{if .SafeSearchEnabled}}safesearch{{end}}
<... | https://github.com/AdguardTeam/AdGuardHome/commit/09a39cce03f69b1f9801e66d763d7b5208411336 | config.go |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> {{if .SafeSearchEnabled}}safesearch{{end}}
<mask> {{if .QueryLogEnabled}}querylog{{end}}
<mask> }{{end}}
<mask> {{.Pprof}}
<mask> hosts {
<mask> fallthrough
<mask> }
<mask> {{if .UpstreamDNS}}forward . {{range .UpstreamDNS}}{{.}} {{end}}{{end}}
<mask> {{.Cache}}
<mas... | https://github.com/AdguardTeam/AdGuardHome/commit/09a39cce03f69b1f9801e66d763d7b5208411336 | config.go |
keep keep keep keep replace keep keep replace replace replace keep | <mask> *p = defaultPlugin
<mask> p.d = dnsfilter.New()
<mask> p.hosts = make(map[string]net.IP)
<mask>
<mask> var filterFileName string
<mask> for c.Next() {
<mask> args := c.RemainingArgs()
<mask> if len(args) == 0 {
<mask> // must have at least one argument
<mask> return nil, c.ArgErr()
<ma... | https://github.com/AdguardTeam/AdGuardHome/commit/09a39cce03f69b1f9801e66d763d7b5208411336 | coredns_plugin/coredns_plugin.go |
keep keep keep keep replace keep keep keep keep keep | <mask> if len(args) == 0 {
<mask> // must have at least one argument
<mask> return nil, c.ArgErr()
<mask> }
<mask> filterFileName = args[0]
<mask> for c.NextBlock() {
<mask> switch c.Val() {
<mask> case "safebrowsing":
<mask> p.d.EnableSafeBrowsing()
<mask> if c.NextArg() {
</s> A... | https://github.com/AdguardTeam/AdGuardHome/commit/09a39cce03f69b1f9801e66d763d7b5208411336 | coredns_plugin/coredns_plugin.go |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> }
<mask> }
<mask> }
<mask>
<mask> file, err := os.Open(filterFileName)
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask> defer file.Close()
<mask>
<mask> count := 0
<mask> scanner := bufio.NewScanner(file)
<mask> for scanner.Scan() {
<mask> text := scanner.Text()
<ma... | https://github.com/AdguardTeam/AdGuardHome/commit/09a39cce03f69b1f9801e66d763d7b5208411336 | coredns_plugin/coredns_plugin.go |
keep keep keep keep replace replace replace keep replace replace keep | <mask> }
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask> count++
<mask> }
<mask> log.Printf("Added %d rules from %s", count, filterFileName)
<mask>
<mask> if err = scanner.Err(); err != nil {
<mask> return nil, err
<mask> }
</s> Allow disabling of filtering but keeping queryl... | https://github.com/AdguardTeam/AdGuardHome/commit/09a39cce03f69b1f9801e66d763d7b5208411336 | coredns_plugin/coredns_plugin.go |
keep add keep keep keep keep | <mask> }
<mask>
<mask> p.upstream, err = upstream.New(nil)
<mask> if err != nil {
<mask> return nil, err
<mask> }
</s> Allow disabling of filtering but keeping querylog, safebrowsing, safesearch and parental working. </s> remove if err = scanner.Err(); err != nil {
return nil, err
</s> add if err = ... | https://github.com/AdguardTeam/AdGuardHome/commit/09a39cce03f69b1f9801e66d763d7b5208411336 | coredns_plugin/coredns_plugin.go |
keep keep keep keep replace keep keep keep keep keep | <mask> for i, testcase := range []struct {
<mask> config string
<mask> failing bool
<mask> }{
<mask> {`dnsfilter`, true},
<mask> {`dnsfilter ../tests/dns.txt`, false},
<mask> {`dnsfilter ../tests/dns.txt { safebrowsing }`, false},
<mask> {`dnsfilter ../tests/dns.txt { parental }`, true},
<mask> ... | https://github.com/AdguardTeam/AdGuardHome/commit/09a39cce03f69b1f9801e66d763d7b5208411336 | coredns_plugin/coredns_plugin_test.go |
keep keep add keep keep keep keep keep keep | <mask> github.com/AdguardTeam/golibs v0.4.4
<mask> github.com/AdguardTeam/urlfilter v0.13.0
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/beefsack/go-rate v0.0.0-20200827232406-6cde80facd47 // indirect
<mask> github.com/fsnotify/fsnotify v1.4.9
<mask> github.com/go-ping/ping v0.0.0-20201115... | https://github.com/AdguardTeam/AdGuardHome/commit/09b6eba7d9de4ac9522acad8585d9befe7e2cea1 | go.mod |
keep keep keep keep replace replace keep keep keep keep keep | <mask> github.com/AdguardTeam/golibs v0.4.3/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.4.4 h1:cM9UySQiYFW79zo5XRwnaIWVzfW4eNXmZktMrWbthpw=
<mask> github.com/AdguardTeam/golibs v0.4.4/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardT... | https://github.com/AdguardTeam/AdGuardHome/commit/09b6eba7d9de4ac9522acad8585d9befe7e2cea1 | go.sum |
keep keep keep keep replace replace keep keep keep keep keep | <mask> github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
<mask> github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
<mask> github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI=
<mask> github.com/go-ole/go-ole v1.... | https://github.com/AdguardTeam/AdGuardHome/commit/09b6eba7d9de4ac9522acad8585d9befe7e2cea1 | go.sum |
keep keep keep keep replace replace keep keep keep keep keep | <mask> github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
<mask> github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
<mask> github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfV... | https://github.com/AdguardTeam/AdGuardHome/commit/09b6eba7d9de4ac9522acad8585d9befe7e2cea1 | go.sum |
keep keep keep keep replace replace keep keep keep keep keep | <mask> github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
<mask> github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
<mask> github.com/lucas-clemente/quic-go v0.18.1 h1:DMR7guC0NtVS8zNZR3IO7NARZvZygkSC56GGtC6cyys=
<mask> github.com/lucas-clemente/quic-go v0.18.1/g... | https://github.com/AdguardTeam/AdGuardHome/commit/09b6eba7d9de4ac9522acad8585d9befe7e2cea1 | go.sum |
keep keep keep keep replace replace keep keep keep keep keep | <mask> golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
<mask> golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
<mask> golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897 h1:pLI5jrR7OSLijeIDcmRxNmw2a... | https://github.com/AdguardTeam/AdGuardHome/commit/09b6eba7d9de4ac9522acad8585d9befe7e2cea1 | go.sum |
keep keep keep keep replace keep keep keep keep keep | <mask> golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
<mask> golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hsh... | https://github.com/AdguardTeam/AdGuardHome/commit/09b6eba7d9de4ac9522acad8585d9befe7e2cea1 | go.sum |
keep keep add keep keep keep keep keep keep | <mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/dnsproxy/upstream"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> // FilteringConfig represents the DNS filtering configuration of AdGuard Home
<mask> // The zero FilteringConfig is empty and ready for use.
<mas... | https://github.com/AdguardTeam/AdGuardHome/commit/09b6eba7d9de4ac9522acad8585d9befe7e2cea1 | internal/dnsforward/config.go |
keep keep keep add keep keep keep keep | <mask> // DNS names from certificate (SAN) or CN value from Subject
<mask> dnsNames []string
<mask> }
<mask>
<mask> // ServerConfig represents server configuration.
<mask> // The zero ServerConfig is empty and ready for use.
<mask> type ServerConfig struct {
<mask> UDPListenAddr *net.UDPAddr // UD... | https://github.com/AdguardTeam/AdGuardHome/commit/09b6eba7d9de4ac9522acad8585d9befe7e2cea1 | internal/dnsforward/config.go |
keep add keep keep keep keep | <mask> FilteringConfig
<mask> TLSConfig
<mask> TLSAllowUnencryptedDOH bool
<mask>
<mask> TLSv12Roots *x509.CertPool // list of root CAs for TLSv1.2
<mask> TLSCiphers []uint16 // list of TLS ciphers to use
</s> Pull request: all: add dnscrypt support
Merge in DNS/adguard-home from 1361-dnscrypt to m... | https://github.com/AdguardTeam/AdGuardHome/commit/09b6eba7d9de4ac9522acad8585d9befe7e2cea1 | internal/dnsforward/config.go |
keep keep keep add keep keep keep keep keep keep | <mask> if err != nil {
<mask> return proxyConfig, err
<mask> }
<mask>
<mask> // Validate proxy config
<mask> if proxyConfig.UpstreamConfig == nil || len(proxyConfig.UpstreamConfig.Upstreams) == 0 {
<mask> return proxyConfig, errors.New("no default upstream servers configured")
<mask> }
<mask>
<mask... | https://github.com/AdguardTeam/AdGuardHome/commit/09b6eba7d9de4ac9522acad8585d9befe7e2cea1 | internal/dnsforward/config.go |
keep keep keep add keep keep keep keep keep | <mask> PortHTTPS int `yaml:"port_https" json:"port_https,omitempty"` // HTTPS port. If 0, HTTPS will be disabled
<mask> PortDNSOverTLS int `yaml:"port_dns_over_tls" json:"port_dns_over_tls,omitempty"` // DNS-over-TLS port. If 0, DOT will be disabled
<mask> PortDNSOverQUIC uint16 `ya... | https://github.com/AdguardTeam/AdGuardHome/commit/09b6eba7d9de4ac9522acad8585d9befe7e2cea1 | internal/home/config.go |
keep keep add keep keep keep keep keep | <mask> import (
<mask> "fmt"
<mask> "net"
<mask> "path/filepath"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/agherr"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
</s> Pull request: all: add dnscrypt support
... | https://github.com/AdguardTeam/AdGuardHome/commit/09b6eba7d9de4ac9522acad8585d9befe7e2cea1 | internal/home/dns.go |
keep add keep keep keep keep keep keep | <mask> "path/filepath"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/querylog"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/stats"
<mask> "github.com/AdguardTe... | https://github.com/AdguardTeam/AdGuardHome/commit/09b6eba7d9de4ac9522acad8585d9befe7e2cea1 | internal/home/dns.go |
keep add keep keep keep keep | <mask> "github.com/AdguardTeam/dnsproxy/proxy"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> // Called by other modules when configuration is changed
<mask> func onConfigModified() {
</s> Pull request: all: add dnscrypt support
Merge in DNS/adguard-home from 1361-dnscrypt to master
Close... | https://github.com/AdguardTeam/AdGuardHome/commit/09b6eba7d9de4ac9522acad8585d9befe7e2cea1 | internal/home/dns.go |
keep keep keep keep replace keep keep keep keep keep | <mask> p.DHCPServer = Context.dhcpServer
<mask> }
<mask> Context.dnsServer = dnsforward.NewServer(p)
<mask> Context.clients.dnsServer = Context.dnsServer
<mask> dnsConfig := generateServerConfig()
<mask> err = Context.dnsServer.Prepare(&dnsConfig)
<mask> if err != nil {
<mask> closeDNSServer()
<mask>... | https://github.com/AdguardTeam/AdGuardHome/commit/09b6eba7d9de4ac9522acad8585d9befe7e2cea1 | internal/home/dns.go |
keep keep keep keep replace replace replace replace keep keep keep keep keep | <mask> Context.whois.Begin(ip)
<mask> }
<mask> }
<mask>
<mask> func generateServerConfig() dnsforward.ServerConfig {
<mask> newconfig := dnsforward.ServerConfig{
<mask> UDPListenAddr: &net.UDPAddr{IP: net.ParseIP(config.DNS.BindHost), Port: config.DNS.Port},
<mask> TCPListenAddr: &net.TCPAddr{IP: n... | https://github.com/AdguardTeam/AdGuardHome/commit/09b6eba7d9de4ac9522acad8585d9befe7e2cea1 | internal/home/dns.go |
keep keep keep keep replace keep keep keep keep keep | <mask> newconfig.TLSConfig = tlsConf.TLSConfig
<mask>
<mask> if tlsConf.PortDNSOverTLS != 0 {
<mask> newconfig.TLSListenAddr = &net.TCPAddr{
<mask> IP: net.ParseIP(config.DNS.BindHost),
<mask> Port: tlsConf.PortDNSOverTLS,
<mask> }
<mask> }
<mask>
<mask> if tlsConf.PortDNSOverQUIC !=... | https://github.com/AdguardTeam/AdGuardHome/commit/09b6eba7d9de4ac9522acad8585d9befe7e2cea1 | internal/home/dns.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> if tlsConf.PortDNSOverQUIC != 0 {
<mask> newconfig.QUICListenAddr = &net.UDPAddr{
<mask> IP: net.ParseIP(config.DNS.BindHost),
<mask> Port: int(tlsConf.PortDNSOverQUIC),
<mask> }
<mask> }
<mask> }
<mask> newconfig.TLSv12Roots = Context.tlsRoots
</s> Pull reques... | https://github.com/AdguardTeam/AdGuardHome/commit/09b6eba7d9de4ac9522acad8585d9befe7e2cea1 | internal/home/dns.go |
keep add keep keep keep keep keep keep | <mask> }
<mask> }
<mask> }
<mask>
<mask> newconfig.TLSv12Roots = Context.tlsRoots
<mask> newconfig.TLSCiphers = Context.tlsCiphers
<mask> newconfig.TLSAllowUnencryptedDOH = tlsConf.AllowUnencryptedDOH
<mask>
</s> Pull request: all: add dnscrypt support
Merge in DNS/adguard-home from 1361-dnscrypt t... | https://github.com/AdguardTeam/AdGuardHome/commit/09b6eba7d9de4ac9522acad8585d9befe7e2cea1 | internal/home/dns.go |
keep keep keep keep replace keep keep keep keep keep | <mask> newconfig.TLSAllowUnencryptedDOH = tlsConf.AllowUnencryptedDOH
<mask>
<mask> newconfig.FilterHandler = applyAdditionalFiltering
<mask> newconfig.GetCustomUpstreamByClient = Context.clients.FindUpstreams
<mask> return newconfig
<mask> }
<mask>
<mask> type dnsEncryption struct {
<mask> https string... | https://github.com/AdguardTeam/AdGuardHome/commit/09b6eba7d9de4ac9522acad8585d9befe7e2cea1 | internal/home/dns.go |
keep keep keep keep replace replace replace keep replace keep keep | <mask>
<mask> return nil
<mask> }
<mask>
<mask> func reconfigureDNSServer() error {
<mask> newconfig := generateServerConfig()
<mask> err := Context.dnsServer.Reconfigure(&newconfig)
<mask> if err != nil {
<mask> return fmt.Errorf("couldn't start forwarding DNS server: %w", err)
<mask> }
<mask>
</... | https://github.com/AdguardTeam/AdGuardHome/commit/09b6eba7d9de4ac9522acad8585d9befe7e2cea1 | internal/home/dns.go |
keep keep keep keep replace keep keep keep keep keep | <mask> dispatch(getVersion());
<mask> dispatch(getTlsStatus());
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(initSettingsFailure());
<mask> }
<mask> };
<mask>
<mask> export const enableDnsRequest = createAction('ENABLE_DNS_REQUEST'... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/actions/index.js |
keep keep keep keep replace keep keep keep keep keep | <mask> ) || [];
<mask>
<mask> await apiClient.setUpstream(values);
<mask> dispatch(addSuccessToast('updated_upstream_dns_toast'));
<mask> dispatch(setUpstreamSuccess());
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(setUp... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/actions/index.js |
keep keep keep keep replace keep keep keep keep keep | <mask> import { Trans, withNamespaces } from 'react-i18next';
<mask> import flow from 'lodash/flow';
<mask>
<mask> const Form = (props) => {
<mask> const { handleSubmit, submitting, invalid } = props;
<mask>
<mask> return (
<mask> <form onSubmit={handleSubmit}>
<mask> <div classNa... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/components/Settings/Dns/Access/Form.js |
keep add keep keep keep keep | <mask> type="text"
<mask> className="form-control form-control--textarea"
<mask> />
<mask> </div>
<mask> <div className="form__group mb-5">
<mask> <label className="form__label form__label--with-desc" htmlFor="disallow... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/components/Settings/Dns/Access/Form.js |
keep keep keep add keep keep keep keep | <mask> name="disallowed_clients"
<mask> component="textarea"
<mask> type="text"
<mask> className="form-control form-control--textarea"
<mask> />
<mask> </div>
<mask> <div className="form__group... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/components/Settings/Dns/Access/Form.js |
keep add keep keep keep keep keep | <mask> type="text"
<mask> className="form-control form-control--textarea"
<mask> />
<mask> </div>
<mask> <div className="card-actions">
<mask> <div className="btn-list">
<mask> <button
</s> - clie... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/components/Settings/Dns/Access/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> <div className="btn-list">
<mask> <button
<mask> type="submit"
<mask> className="btn btn-success btn-standard"
<mask> disabled={submitting || invalid}
<mask> >
<mask> ... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/components/Settings/Dns/Access/Form.js |
keep keep keep keep replace replace replace replace replace keep keep keep | <mask> );
<mask> };
<mask>
<mask> Form.propTypes = {
<mask> handleSubmit: PropTypes.func,
<mask> submitting: PropTypes.bool,
<mask> invalid: PropTypes.bool,
<mask> initialValues: PropTypes.object,
<mask> t: PropTypes.func,
<mask> };
<mask>
<mask> export default flow([withNamespaces... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/components/Settings/Dns/Access/Form.js |
keep keep keep keep replace replace replace replace replace keep keep keep keep keep | <mask>
<mask> render() {
<mask> const { t, access } = this.props;
<mask>
<mask> const {
<mask> processing,
<mask> processingSet,
<mask> ...values
<mask> } = access;
<mask>
<mask> return (
<mask> <Card
<mask> ... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/components/Settings/Dns/Access/index.js |
keep keep add keep keep keep keep | <mask> <Form
<mask> initialValues={values}
<mask> onSubmit={this.handleFormSubmit}
<mask> />
<mask> </Card>
<mask> );
<mask> }
</s> - client: fix upstream DNS servers form
Closes #1000 </s> remove check: null,
... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/components/Settings/Dns/Access/index.js |
keep add keep keep keep keep keep | <mask> className="form-control form-control--textarea"
<mask> placeholder={t('upstream_dns')}
<mask> />
<mask> </div>
<mask> </div>
<mask> <div className="col-12">
<mask> ... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/components/Settings/Dns/Upstream/Form.js |
keep keep add keep keep keep keep keep | <mask> type="checkbox"
<mask> component={renderSelectField}
<mask> placeholder={t('upstream_parallel')}
<mask> />
<mask> </div>
<mask> </div>
<mask> <div... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/components/Settings/Dns/Upstream/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> <hr />
<mask> </div>
<mask> <div className="col-12">
<mask> <div className="form__group">
<mask> <label className="form__label form__label--with-desc" htmlFor="bootstrap_dns">
<mask> ... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/components/Settings/Dns/Upstream/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> id="bootstrap_dns"
<mask> name="bootstrap_dns"
<mask> component="textarea"
<mask> type="text"
<mask> className="form-control"
<mask> placeh... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/components/Settings/Dns/Upstream/Form.js |
keep keep keep add keep keep keep keep | <mask> component="textarea"
<mask> type="text"
<mask> className="form-control form-control--textarea form-control--textarea-small"
<mask> placeholder={t('bootstrap_dns')}
<mask> /... | https://github.com/AdguardTeam/AdGuardHome/commit/0a26ee422403d78a1e1ef56270deb11b6e646156 | client/src/components/Settings/Dns/Upstream/Form.js |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.