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 |
|---|---|---|---|---|
return "", fmt.Errorf("parsing private key: %w", err) | <mask> }
<mask>
<mask> _, keyType, err := parsePrivateKey(key.Bytes)
<mask> if err != nil {
<mask> return fmt.Errorf("parsing private key: %w", err)
<mask> }
<mask>
<mask> if keyType == keyTypeED25519 {
<mask> return errors.Error(
<mask> "ED25519 keys are not supported by browsers; " +
</s> Pul... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls.go |
return "", errors.Error( | <mask> return fmt.Errorf("parsing private key: %w", err)
<mask> }
<mask>
<mask> if keyType == keyTypeED25519 {
<mask> return errors.Error(
<mask> "ED25519 keys are not supported by browsers; " +
<mask> "did you mean to use X25519 for key exchange?",
<mask> )
<mask> }
<mask>
</s> Pull reques... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls.go |
return keyType, nil | <mask> "did you mean to use X25519 for key exchange?",
<mask> )
<mask> }
<mask>
<mask> status.ValidKey = true
<mask> status.KeyType = keyType
<mask>
<mask> return nil
<mask> }
<mask>
<mask> // validateCertificates processes certificate data and its private key. All
<mask> // parameters are opt... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls.go |
// validateCertificates processes certificate data and its private key. status
// must not be nil, since it's used to accumulate the validation results. Other
// parameters are optional. | <mask>
<mask> return nil
<mask> }
<mask>
<mask> // validateCertificates processes certificate data and its private key. All
<mask> // parameters are optional. status must not be nil. The returned error is also
<mask> // set in status.WarningValidation.
<mask> func validateCertificates(
<mask> status *tl... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls.go |
<mask> certChain []byte,
<mask> pkey []byte,
<mask> serverName string,
<mask> ) (err error) {
<mask> defer func() {
<mask> // Capitalize the warning for the UI. Assume that warnings are all
<mask> // ASCII-only.
<mask> //
<mask> // TODO(a.garipov): Figure out a better way to do this. Perhaps a
<... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls.go | |
var certs []*x509.Certificate
certs, status.ValidCert, err = parseCertChain(certChain)
if !status.ValidCert {
// Don't wrap the error, since it's informative enough as is. | <mask> }()
<mask>
<mask> // Check only the public certificate separately from the key.
<mask> if len(certChain) > 0 {
<mask> err = validateCertChain(status, certChain, serverName)
<mask> if err != nil {
<mask> return err
<mask> }
<mask> }
<mask>
<mask> // Validate the private key by parsing i... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls.go |
mainCert := certs[0]
status.Subject = mainCert.Subject.String()
status.Issuer = mainCert.Issuer.String()
status.NotAfter = mainCert.NotAfter
status.NotBefore = mainCert.NotBefore
status.DNSNames = mainCert.DNSNames
if chainErr := validateCertChain(certs, serverName); chainErr != nil {
// Let self-sign... | <mask> // Don't wrap the error, since it's informative enough as is.
<mask> return err
<mask> }
<mask> }
<mask>
<mask> // Validate the private key by parsing it.
<mask> if len(pkey) > 0 {
<mask> var keyErr error
</s> Pull request: 4898-redirect-https
Merge in DNS/adguard-home from 4898-redirect-... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls.go |
var keyErr error
status.KeyType, keyErr = validatePKey(pkey)
if keyErr != nil {
// Don't wrap the error, since it's informative enough as is.
return keyErr | <mask> }
<mask>
<mask> // Validate the private key by parsing it.
<mask> if len(pkey) > 0 {
<mask> err = validatePKey(status, pkey)
<mask> if err != nil {
<mask> return err
<mask> }
<mask> }
<mask>
<mask> // If both are set, validate together.
<mask> if len(certChain) > 0 && len(pkey) > 0 {... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls.go |
status.ValidKey = true | <mask> return keyErr
<mask> }
<mask> }
<mask>
<mask> // If both are set, validate together.
<mask> if len(certChain) > 0 && len(pkey) > 0 {
<mask> _, pairErr := tls.X509KeyPair(certChain, pkey)
<mask> if pairErr != nil {
</s> Pull request: 4898-redirect-https
Merge in DNS/adguard-home from 4898-r... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls.go |
_, pairErr := tls.X509KeyPair(certChain, pkey)
if pairErr != nil {
return fmt.Errorf("certificate-key pair: %w", pairErr) | <mask> }
<mask>
<mask> // If both are set, validate together.
<mask> if len(certChain) > 0 && len(pkey) > 0 {
<mask> _, err = tls.X509KeyPair(certChain, pkey)
<mask> if err != nil {
<mask> err = fmt.Errorf("certificate-key pair: %w", err)
<mask> status.WarningValidation = err.Error()
<mask>
<ma... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls.go |
return err | <mask>
<mask> status.ValidPair = true
<mask> }
<mask>
<mask> return nil
<mask> }
<mask>
<mask> // Key types.
<mask> const (
<mask> keyTypeECDSA = "ECDSA"
</s> Pull request: 4898-redirect-https
Merge in DNS/adguard-home from 4898-redirect-https to master
Updates #4898.
Updates #4927.
Squashed com... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls.go |
"github.com/AdguardTeam/golibs/testutil" | <mask> "time"
<mask>
<mask> "github.com/stretchr/testify/assert"
<mask> )
<mask>
<mask> var testCertChainData = []byte(`-----BEGIN CERTIFICATE-----
<mask> MIICKzCCAZSgAwIBAgIJAMT9kPVJdM7LMA0GCSqGSIb3DQEBCwUAMC0xFDASBgNV
</s> Pull request: 4898-redirect-https
Merge in DNS/adguard-home from 4898-redirect-htt... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls_internal_test.go |
testutil.AssertErrorMsg(t, "empty certificate", err) | <mask> func TestValidateCertificates(t *testing.T) {
<mask> t.Run("bad_certificate", func(t *testing.T) {
<mask> status := &tlsConfigStatus{}
<mask> err := validateCertificates(status, []byte("bad cert"), nil, "")
<mask> assert.Error(t, err)
<mask> assert.NotEmpty(t, status.WarningValidation)
<mask> a... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls_internal_test.go |
testutil.AssertErrorMsg(t, "no valid keys were found", err) | <mask>
<mask> t.Run("bad_private_key", func(t *testing.T) {
<mask> status := &tlsConfigStatus{}
<mask> err := validateCertificates(status, nil, []byte("bad priv key"), "")
<mask> assert.Error(t, err)
<mask> assert.NotEmpty(t, status.WarningValidation)
<mask> assert.False(t, status.ValidKey)
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls_internal_test.go |
assert.Error(t, err) | <mask>
<mask> t.Run("valid", func(t *testing.T) {
<mask> status := &tlsConfigStatus{}
<mask> err := validateCertificates(status, testCertChainData, testPrivateKeyData, "")
<mask> assert.NoError(t, err)
<mask>
<mask> notBefore := time.Date(2019, 2, 27, 9, 24, 23, 0, time.UTC)
<mask> notAfter := time... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls_internal_test.go |
<mask>
<mask> notBefore := time.Date(2019, 2, 27, 9, 24, 23, 0, time.UTC)
<mask> notAfter := time.Date(2046, 7, 14, 9, 24, 23, 0, time.UTC)
<mask>
<mask> assert.NotEmpty(t, status.WarningValidation)
<mask> assert.True(t, status.ValidCert)
<mask> assert.False(t, status.ValidChain)
<mask> assert.Tru... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5565a9e4e5e3cd54dd6d8c34e326c5f166ec401 | internal/home/tls_internal_test.go | |
cd ./dist/
| <mask> #!/bin/sh
<mask>
<mask> set -e -f -u -x
<mask> export CHANNEL="${bamboo.channel}"
<mask> ./bamboo-deploy-publisher/deploy.sh adguard-home-"$CHANNEL"
<mask> 'final-tasks':
<mask> - 'clean'
<mask> 'requirements':
<mask> - 'adg-docker': 'true'
</s> Pull request: ba... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5f4d0ce44fe6d8b06560be6d882764905c302d4 | bamboo-specs/release.yaml |
cd ./dist/
| <mask> - |
<mask> #!/bin/sh
<mask>
<mask> set -e -f -u -x
<mask> env\
<mask> SNAPCRAFT_CHANNEL=edge\
<mask> SNAPCRAFT_EMAIL="${bamboo.snapcraftEmail}"\
<mask> SNAPCRAFT_MACAROON="${bamboo.snapcraftMacaroonPassword}"\
<mask> ... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5f4d0ce44fe6d8b06560be6d882764905c302d4 | bamboo-specs/release.yaml |
cd ./dist/
| <mask> set -e -f -u -x
<mask>
<mask> export CHANNEL="${bamboo.channel}"
<mask> if [ "$CHANNEL" != 'release' -a "${CHANNEL}" != 'beta' ]
<mask> then
<mask> echo "don't publish to Github Releases for this channel"
</s> Pull request: bamboo-specs: cd into dist
Merge i... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c5f4d0ce44fe6d8b06560be6d882764905c302d4 | bamboo-specs/release.yaml |
github.com/ameshkov/dnscrypt/v2 v2.2.7 | <mask> github.com/AdguardTeam/dnsproxy v0.48.3
<mask> github.com/AdguardTeam/golibs v0.13.2
<mask> github.com/AdguardTeam/urlfilter v0.16.1
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/ameshkov/dnscrypt/v2 v2.2.6
<mask> github.com/digineo/go-ipset/v2 v2.2.1
<mask> github.com/dimfeld/http... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c6d4f2317e3ae19ccd13945391ba65ddcd3e2cab | go.mod |
<mask> golang.org/x/sync v0.1.0 // indirect
<mask> golang.org/x/text v0.9.0 // indirect
<mask> golang.org/x/tools v0.8.0 // indirect
<mask> )
<mask>
<mask> // TODO(a.garipov): Remove the replace when @a.meshkov merges
<mask> // https://github.com/ameshkov/dnscrypt/pull/21.
<mask> replace github.com/ameshkov... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c6d4f2317e3ae19ccd13945391ba65ddcd3e2cab | go.mod | |
github.com/ameshkov/dnscrypt/v2 v2.2.7 h1:aEitLIR8HcxVodZ79mgRcCiC0A0I5kZPBuWGFwwulAw=
github.com/ameshkov/dnscrypt/v2 v2.2.7/go.mod h1:qPWhwz6FdSmuK7W4sMyvogrez4MWdtzosdqlr0Rg3ow= | <mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY=
<mask> github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
<mask> github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 h1:52m0LGchQB... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c6d4f2317e3ae19ccd13945391ba65ddcd3e2cab | go.sum |
t.Run("empty", func(t *testing.T) {
sh := theOnlyCmd("cmd", 0, "", nil)
substShell(t, sh.RunCmd)
err := a.Refresh()
require.NoError(t, err)
assert.Empty(t, a.Neighbors())
}) | <mask> testutil.AssertErrorMsg(t, "cmd arpdb: running command: unexpected exit code 1", err)
<mask> })
<mask> }
<mask>
<mask> func TestEmptyARPDB(t *testing.T) {
<mask> a := EmptyARPDB{}
</s> Pull request: 2846 cover aghnet vol.4
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.4 to master
Updates #28... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/arpdb_test.go |
// generateIPv4Hostname generates the hostname by IP address version 4. | <mask> ipv4HostnameMaxLen = len("192-168-100-100")
<mask> ipv6HostnameMaxLen = len("ff80-f076-0000-0000-0000-0000-0000-0010")
<mask> )
<mask>
<mask> // generateIPv4Hostname generates the hostname for specific IP version.
<mask> func generateIPv4Hostname(ipv4 net.IP) (hostname string) {
<mask> hnData := make(... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/hostgen.go |
// generateIPv6Hostname generates the hostname by IP address version 6. | <mask>
<mask> return string(hnData)
<mask> }
<mask>
<mask> // generateIPv6Hostname generates the hostname for specific IP version.
<mask> func generateIPv6Hostname(ipv6 net.IP) (hostname string) {
<mask> hnData := make([]byte, 0, ipv6HostnameMaxLen)
<mask> for i, partsNum := 0, net.IPv6len/2; i < partsNum;... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/hostgen.go |
// ip must be either an IPv4 or an IPv6. | <mask> //
<mask> // ff80-f076-0000-0000-0000-0000-0000-0010
<mask> //
<mask> func GenerateHostname(ip net.IP) (hostname string) {
<mask> if ipv4 := ip.To4(); ipv4 != nil {
<mask> return generateIPv4Hostname(ipv4)
<mask> }
</s> Pull request: 2846 cover aghnet vol.4
Merge in DNS/adguard-home from 2846-cove... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/hostgen.go |
<mask> //
<mask> func GenerateHostname(ip net.IP) (hostname string) {
<mask> if ipv4 := ip.To4(); ipv4 != nil {
<mask> return generateIPv4Hostname(ipv4)
<mask> } else if ipv6 := ip.To16(); ipv6 != nil {
<mask> return generateIPv6Hostname(ipv6)
<mask> }
<mask>
<mask> return ""
<mask> }
</s> Pull requ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/hostgen.go | |
return generateIPv6Hostname(ip) | <mask> } else if ipv6 := ip.To16(); ipv6 != nil {
<mask> return generateIPv6Hostname(ipv6)
<mask> }
<mask>
<mask> return ""
<mask> }
</s> Pull request: 2846 cover aghnet vol.4
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.4 to master
Updates #2846.
Squashed commit of the following:
commit 576ef8... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/hostgen.go |
t.Run("valid", func(t *testing.T) {
testCases := []struct {
name string
want string
ip net.IP
}{{
name: "good_ipv4",
want: "127-0-0-1",
ip: net.IP{127, 0, 0, 1},
}, {
name: "good_ipv6",
want: "fe00-0000-0000-0000-0000-0000-0000-0001",
ip: net.ParseIP("fe00::1"),
}, {
name: "... | <mask> "github.com/stretchr/testify/assert"
<mask> )
<mask>
<mask> func TestGenerateHostName(t *testing.T) {
<mask> testCases := []struct {
<mask> name string
<mask> want string
<mask> ip net.IP
<mask> }{{
<mask> name: "good_ipv4",
<mask> want: "127-0-0-1",
<mask> ip: net.IP{127, 0, 0, 1... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/hostgen_test.go |
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
hostname := GenerateHostname(tc.ip)
assert.Equal(t, tc.want, hostname)
})
}
})
t.Run("invalid", func(t *testing.T) {
testCases := []struct {
name string
ip net.IP
}{{
name: "bad_ipv4",
ip: net.IP{127, 0, 0, 1, 0}... | <mask> want: "",
<mask> ip: nil,
<mask> }}
<mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> hostname := GenerateHostname(tc.ip)
<mask> assert.Equal(t, tc.want, hostname)
<mask> })
<mask> }
<mask> }
</s> Pull request: 2846 cover aghnet vol.4
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/hostgen_test.go |
// Variables and functions to substitute in tests.
var (
// aghosRunCommand is the function to run shell commands.
aghosRunCommand = aghos.RunCommand | <mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/AdguardTeam/golibs/netutil"
<mask> )
<mask>
<mask> // aghosRunCommand is the function to run shell commands. It's an unexported
<mask> // variable instead of a direct call to make it substitutable in tests.
<mask> var aghosRunCommand = aghos.RunCo... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net.go |
// netInterfaces is the function to get the available network interfaces.
netInterfaceAddrs = net.InterfaceAddrs
// rootDirFS is the filesystem pointing to the root directory.
rootDirFS = aghos.RootDirFS()
) | <mask> // aghosRunCommand is the function to run shell commands. It's an unexported
<mask> // variable instead of a direct call to make it substitutable in tests.
<mask> var aghosRunCommand = aghos.RunCommand
<mask>
<mask> // rootDirFS is the filesystem pointing to the root directory. It's an
<mask> // unexpor... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net.go |
<mask>
<mask> return net.ParseIP(string(fields[2]))
<mask> }
<mask>
<mask> // CanBindPort checks if we can bind to the given port.
<mask> func CanBindPort(port int) (can bool, err error) {
<mask> var addr *net.TCPAddr
<mask> addr, err = net.ResolveTCPAddr("tcp", fmt.Sprintf("127.0.0.1:%d", port))
<mask> ... | [
"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"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net.go | |
// MarshalText implements the json.Marshaler interface for NetInterface.
func (iface NetInterface) MarshalText() ([]byte, error) { | <mask> Flags net.Flags `json:"flags"`
<mask> MTU int `json:"mtu"`
<mask> }
<mask>
<mask> // MarshalJSON implements the json.Marshaler interface for NetInterface.
<mask> func (iface NetInterface) MarshalJSON() ([]byte, error) {
<mask> type netInterface NetInterface
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net.go |
// GetValidNetInterfacesForWeb returns interfaces that are eligible for DNS and
// WEB only we do not return link-local addresses here.
//
// TODO(e.burkov): Can't properly test the function since it's nontrivial to
// substitute net.Interface.Addrs and the net.InterfaceAddrs can't be used.
func GetValidNetInterfacesF... | <mask> netInterface: netInterface(iface),
<mask> })
<mask> }
<mask>
<mask> // GetValidNetInterfacesForWeb returns interfaces that are eligible for DNS and WEB only
<mask> // we do not return link-local addresses here
<mask> func GetValidNetInterfacesForWeb() (netInterfaces []*NetInterface, err error) {
<mas... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net.go |
netIfaces = append(netIfaces, netIface) | <mask> }
<mask>
<mask> // Discard interfaces with no addresses.
<mask> if len(netIface.Addresses) != 0 {
<mask> netInterfaces = append(netInterfaces, netIface)
<mask> }
<mask> }
<mask>
<mask> return netInterfaces, nil
<mask> }
</s> Pull request: 2846 cover aghnet vol.4
Merge in DNS/adguard-ho... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net.go |
return netIfaces, nil | <mask> netInterfaces = append(netInterfaces, netIface)
<mask> }
<mask> }
<mask>
<mask> return netInterfaces, nil
<mask> }
<mask>
<mask> // GetInterfaceByIP returns the name of interface containing provided ip.
<mask> func GetInterfaceByIP(ip net.IP) string {
<mask> ifaces, err := GetValidNetInterfac... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net.go |
//
// TODO(e.burkov): See TODO on GetValidInterfacesForWeb. | <mask> return netIfaces, nil
<mask> }
<mask>
<mask> // GetInterfaceByIP returns the name of interface containing provided ip.
<mask> func GetInterfaceByIP(ip net.IP) string {
<mask> ifaces, err := GetValidNetInterfacesForWeb()
<mask> if err != nil {
<mask> return ""
</s> Pull request: 2846 cover aghnet v... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net.go |
//
// TODO(e.burkov): See TODO on GetValidInterfacesForWeb. | <mask>
<mask> // GetSubnet returns pointer to net.IPNet for the specified interface or nil if
<mask> // the search fails.
<mask> func GetSubnet(ifaceName string) *net.IPNet {
<mask> netIfaces, err := GetValidNetInterfacesForWeb()
<mask> if err != nil {
<mask> log.Error("Could not get network interfaces info... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net.go |
var ifaceAddrs []net.Addr
ifaceAddrs, err = netInterfaceAddrs() | <mask>
<mask> // CollectAllIfacesAddrs returns the slice of all network interfaces IP
<mask> // addresses without port number.
<mask> func CollectAllIfacesAddrs() (addrs []string, err error) {
<mask> var ifaces []net.Interface
<mask> ifaces, err = net.Interfaces()
<mask> if err != nil {
<mask> return nil,... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net.go |
return nil, fmt.Errorf("getting interfaces addresses: %w", err) | <mask> func CollectAllIfacesAddrs() (addrs []string, err error) {
<mask> var ifaces []net.Interface
<mask> ifaces, err = net.Interfaces()
<mask> if err != nil {
<mask> return nil, fmt.Errorf("getting network interfaces: %w", err)
<mask> }
<mask>
<mask> for _, iface := range ifaces {
<mask> var ifaceA... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net.go |
for _, addr := range ifaceAddrs {
cidr := addr.String()
var ip net.IP
ip, _, err = net.ParseCIDR(cidr) | <mask> if err != nil {
<mask> return nil, fmt.Errorf("getting network interfaces: %w", err)
<mask> }
<mask>
<mask> for _, iface := range ifaces {
<mask> var ifaceAddrs []net.Addr
<mask> ifaceAddrs, err = iface.Addrs()
<mask> if err != nil {
<mask> return nil, fmt.Errorf("getting addresses for %q... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net.go |
return nil, fmt.Errorf("parsing cidr: %w", err) | <mask> for _, iface := range ifaces {
<mask> var ifaceAddrs []net.Addr
<mask> ifaceAddrs, err = iface.Addrs()
<mask> if err != nil {
<mask> return nil, fmt.Errorf("getting addresses for %q: %w", iface.Name, err)
<mask> }
<mask>
<mask> for _, addr := range ifaceAddrs {
<mask> cidr := addr.Stri... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net.go |
addrs = append(addrs, ip.String()) | <mask> if err != nil {
<mask> return nil, fmt.Errorf("getting addresses for %q: %w", iface.Name, err)
<mask> }
<mask>
<mask> for _, addr := range ifaceAddrs {
<mask> cidr := addr.String()
<mask> var ip net.IP
<mask> ip, _, err = net.ParseCIDR(cidr)
<mask> if err != nil {
<mask> retur... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net.go |
<mask> gatewayIP string
<mask> static bool
<mask> }
<mask>
<mask> func canBindPrivilegedPorts() (can bool, err error) {
<mask> return aghos.HaveAdminRights()
<mask> }
<mask>
<mask> func ifaceHasStaticIP(ifaceName string) (ok bool, err error) {
<mask> portInfo, err := getCurrentHardwarePortInfo(ifaceN... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net_darwin.go | |
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghos"
<mask> )
<mask>
<mask> func canBindPrivilegedPorts() (can bool, err error) {
<mask> return aghos.HaveAdminRights()
<mask> }
<mask>
<mask> func ifaceHasStaticIP(ifaceName string) (ok bool, err error) {
<mask> const rcConfFilename = "etc/rc... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net_freebsd.go | |
func TestIfaceHasStaticIP(t *testing.T) { | <mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> func TestRcConfStaticConfig(t *testing.T) {
<mask> const (
<mask> ifaceName = `em0`
<mask> rcConf = "etc/rc.conf"
<mask> )
<mask>
</s> Pull request: 2846 cover aghnet vol.4
Merge in D... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net_freebsd_test.go |
filename: dhcpcdConf, | <mask> aghos.FileWalker
<mask> filename string
<mask> }{{
<mask> FileWalker: iface.dhcpcdStaticConfig,
<mask> filename: "etc/dhcpcd.conf",
<mask> }, {
<mask> FileWalker: iface.ifacesStaticConfig,
<mask> filename: "etc/network/interfaces",
<mask> }} {
<mask> has, err = pair.Walk(rootDirFS,... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net_linux.go |
<mask>
<mask> return false, ErrNoStaticIPInfo
<mask> }
<mask>
<mask> func canBindPrivilegedPorts() (can bool, err error) {
<mask> cnbs, err := unix.PrctlRetInt(unix.PR_CAP_AMBIENT, unix.PR_CAP_AMBIENT_IS_SET, unix.CAP_NET_BIND_SERVICE, 0, 0)
<mask> // Don't check the error because it's always nil on Linux.
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net_linux.go | |
// interface through dhcpcd.conf. | <mask> return false
<mask> }
<mask>
<mask> // ifaceSetStaticIP configures the system to retain its current IP on the
<mask> // interface through dhcpdc.conf.
<mask> func ifaceSetStaticIP(ifaceName string) (err error) {
<mask> ipNet := GetSubnet(ifaceName)
<mask> if ipNet.IP == nil {
<mask> return errors.... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net_linux.go |
body, err := os.ReadFile(dhcpcdConf) | <mask> if ipNet.IP == nil {
<mask> return errors.Error("can't get IP address")
<mask> }
<mask>
<mask> gatewayIP := GatewayIP(ifaceName)
<mask> add := dhcpcdConfIface(ifaceName, ipNet, gatewayIP, ipNet.IP)
<mask>
<mask> const filename = "/etc/dhcpcd.conf"
<mask>
<mask> body, err := os.ReadFile(filen... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net_linux.go |
gatewayIP := GatewayIP(ifaceName)
add := dhcpcdConfIface(ifaceName, ipNet, gatewayIP)
| <mask> }
<mask>
<mask> body = append(body, []byte(add)...)
<mask> err = maybe.WriteFile(dhcpcdConf, body, 0o644)
<mask> if err != nil {
<mask> return fmt.Errorf("writing conf: %w", err)
</s> Pull request: 2846 cover aghnet vol.4
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.4 to master
Updates #2... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net_linux.go |
err = maybe.WriteFile(dhcpcdConf, body, 0o644) | <mask> return err
<mask> }
<mask>
<mask> body = append(body, []byte(add)...)
<mask> err = maybe.WriteFile(filename, body, 0o644)
<mask> if err != nil {
<mask> return fmt.Errorf("writing conf: %w", err)
<mask> }
<mask>
<mask> return nil
</s> Pull request: 2846 cover aghnet vol.4
Merge in DNS/adgu... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net_linux.go |
func dhcpcdConfIface(ifaceName string, ipNet *net.IPNet, gwIP net.IP) (conf string) {
b := &strings.Builder{}
stringutil.WriteToBuilder(
b,
"\n# ", | <mask> }
<mask>
<mask> // dhcpcdConfIface returns configuration lines for the dhcpdc.conf files that
<mask> // configure the interface to have a static IP.
<mask> func dhcpcdConfIface(ifaceName string, ipNet *net.IPNet, gatewayIP, dnsIP net.IP) (conf string) {
<mask> var body []byte
<mask>
<mask> add := fmt... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net_linux.go |
" added by AdGuard Home.\ninterface ",
ifaceName,
"\nstatic ip_address=",
ipNet.String(),
"\n",
) | <mask>
<mask> add := fmt.Sprintf(
<mask> "\n# %[1]s added by AdGuard Home.\ninterface %[1]s\nstatic ip_address=%s\n",
<mask> ifaceName,
<mask> ipNet)
<mask> body = append(body, []byte(add)...)
<mask>
<mask> if gatewayIP != nil {
<mask> add = fmt.Sprintf("static routers=%s\n", gatewayIP)
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net_linux.go |
if gwIP != nil {
stringutil.WriteToBuilder(b, "static routers=", gwIP.String(), "\n") | <mask> ifaceName,
<mask> ipNet)
<mask> body = append(body, []byte(add)...)
<mask>
<mask> if gatewayIP != nil {
<mask> add = fmt.Sprintf("static routers=%s\n", gatewayIP)
<mask> body = append(body, []byte(add)...)
<mask> }
<mask>
<mask> add = fmt.Sprintf("static domain_name_servers=%s\n\n", dnsIP... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net_linux.go |
stringutil.WriteToBuilder(b, "static domain_name_servers=", ipNet.IP.String(), "\n\n") | <mask> add = fmt.Sprintf("static routers=%s\n", gatewayIP)
<mask> body = append(body, []byte(add)...)
<mask> }
<mask>
<mask> add = fmt.Sprintf("static domain_name_servers=%s\n\n", dnsIP)
<mask> body = append(body, []byte(add)...)
<mask>
<mask> return string(body)
<mask> }
</s> Pull request: 2846 cov... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net_linux.go |
return b.String() | <mask>
<mask> add = fmt.Sprintf("static domain_name_servers=%s\n\n", dnsIP)
<mask> body = append(body, []byte(add)...)
<mask>
<mask> return string(body)
<mask> }
</s> Pull request: 2846 cover aghnet vol.4
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.4 to master
Updates #2846.
Squashed commit of t... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net_linux.go |
<mask> package aghnet
<mask>
<mask> import (
<mask> "io/fs"
<mask> "net"
<mask> "testing"
<mask> "testing/fstest"
<mask>
<mask> "github.com/AdguardTeam/golibs/testutil"
<mask> "github.com/stretchr/testify/assert"
</s> Pull request: 2846 cover aghnet vol.4
Merge in DNS/adguard-home from 2846-cover-ag... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net_linux_test.go | |
<mask> tc.wantHas(t, has)
<mask> })
<mask> }
<mask> }
<mask>
<mask> func TestSetStaticIP_dhcpcdConfIface(t *testing.T) {
<mask> testCases := []struct {
<mask> name string
<mask> dhcpcdConf string
<mask> routers net.IP
<mask> }{{
<mask> name: "with_gateway",
<mask> dhcpcdConf: nl... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"re... | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net_linux_test.go | |
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghos"
<mask> )
<mask>
<mask> func canBindPrivilegedPorts() (can bool, err error) {
<mask> return aghos.HaveAdminRights()
<mask> }
<mask>
<mask> func ifaceHasStaticIP(ifaceName string) (ok bool, err error) {
<mask> filename := fmt.Sprintf("etc/h... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net_openbsd.go | |
// theOnlyCmd returns mapShell that only handles a single command and arguments | <mask> out string
<mask> code int
<mask> }
<mask>
<mask> // theOnlyCmd returns s that only handles a single command and arguments
<mask> // combination from cmd.
<mask> func theOnlyCmd(cmd string, code int, out string, err error) (s mapShell) {
<mask> return mapShell{cmd: {code: code, out: out, err: err}}
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net_test.go |
// ifaceAddrsFunc is the signature of net.InterfaceAddrs function.
type ifaceAddrsFunc func() (ifaces []net.Addr, err error)
// substNetInterfaceAddrs replaces the the net.InterfaceAddrs function used
// throughout the package with f for tests ran under t.
func substNetInterfaceAddrs(t *testing.T, f ifaceAddrsFunc) {
... | <mask> }
<mask>
<mask> func TestGatewayIP(t *testing.T) {
<mask> const ifaceName = "ifaceName"
<mask> const cmd = "ip route show dev " + ifaceName
<mask>
</s> Pull request: 2846 cover aghnet vol.4
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.4 to master
Updates #2846.
Squashed commit of the follow... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net_test.go |
const ifaceName = "ifaceName"
const cmd = "ip route show dev " + ifaceName
| <mask> }
<mask>
<mask> func TestGatewayIP(t *testing.T) {
<mask> testCases := []struct {
<mask> name string
<mask> shell mapShell
<mask> want net.IP
<mask> }{{
</s> Pull request: 2846 cover aghnet vol.4
Merge in DNS/adguard-home from 2846-cover-aghnet-vol.4 to master
Updates #2846.
Squashed commi... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net_test.go |
shell: theOnlyCmd(cmd, 0, `default via 1.2.3.4 onlink`, nil), | <mask> shell mapShell
<mask> want net.IP
<mask> }{{
<mask> name: "success_v4",
<mask> shell: theOnlyCmd("ip route show dev ifaceName", 0, `default via 1.2.3.4 onlink`, nil),
<mask> want: net.IP{1, 2, 3, 4}.To16(),
<mask> }, {
<mask> name: "success_v6",
<mask> shell: theOnlyCmd("ip route sho... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net_test.go |
shell: theOnlyCmd(cmd, 0, `default via ::ffff onlink`, nil), | <mask> shell: theOnlyCmd("ip route show dev ifaceName", 0, `default via 1.2.3.4 onlink`, nil),
<mask> want: net.IP{1, 2, 3, 4}.To16(),
<mask> }, {
<mask> name: "success_v6",
<mask> shell: theOnlyCmd("ip route show dev ifaceName", 0, `default via ::ffff onlink`, nil),
<mask> want: net.IP{
<mask> 0... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net_test.go |
shell: theOnlyCmd(cmd, 0, `non-default via 1.2.3.4 onlink`, nil), | <mask> 0x0, 0x0, 0xFF, 0xFF,
<mask> },
<mask> }, {
<mask> name: "bad_output",
<mask> shell: theOnlyCmd("ip route show dev ifaceName", 0, `non-default via 1.2.3.4 onlink`, nil),
<mask> want: nil,
<mask> }, {
<mask> name: "err_runcmd",
<mask> shell: theOnlyCmd("ip route show dev ifaceName", 0... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net_test.go |
shell: theOnlyCmd(cmd, 0, "", errors.Error("can't run command")), | <mask> shell: theOnlyCmd("ip route show dev ifaceName", 0, `non-default via 1.2.3.4 onlink`, nil),
<mask> want: nil,
<mask> }, {
<mask> name: "err_runcmd",
<mask> shell: theOnlyCmd("ip route show dev ifaceName", 0, "", errors.Error("can't run command")),
<mask> want: nil,
<mask> }, {
<mask> nam... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net_test.go |
shell: theOnlyCmd(cmd, 1, "", nil), | <mask> shell: theOnlyCmd("ip route show dev ifaceName", 0, "", errors.Error("can't run command")),
<mask> want: nil,
<mask> }, {
<mask> name: "bad_code",
<mask> shell: theOnlyCmd("ip route show dev ifaceName", 1, "", nil),
<mask> want: nil,
<mask> }}
<mask>
<mask> for _, tc := range testCases ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net_test.go |
assert.Equal(t, tc.want, GatewayIP(ifaceName)) | <mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> substShell(t, tc.shell.RunCmd)
<mask>
<mask> assert.Equal(t, tc.want, GatewayIP("ifaceName"))
<mask> })
<mask> }
<mask> }
<mask>
<mask> func TestGetInterfaceByIP(t *testing.T) {
</s> Pull request: 2846 cover... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net_test.go |
testCases := []struct {
name string
wantErrMsg string
addrs []net.Addr
wantAddrs []string
}{{
name: "success",
wantErrMsg: ``,
addrs: []net.Addr{&net.IPNet{
IP: net.IP{1, 2, 3, 4},
Mask: net.CIDRMask(24, netutil.IPv4BitLen),
}, &net.IPNet{
IP: net.IP{4, 3, 2, 1},
Mask... | <mask> })
<mask> }
<mask>
<mask> func TestCollectAllIfacesAddrs(t *testing.T) {
<mask> t.Skip("TODO(e.burkov): Substitute the net.Interfaces.")
<mask>
<mask> addrs, err := CollectAllIfacesAddrs()
<mask> require.NoError(t, err)
<mask>
<mask> assert.NotEmpty(t, addrs)
</s> Pull request: 2846 cover agh... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net_test.go |
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
substNetInterfaceAddrs(t, func() ([]net.Addr, error) { return tc.addrs, nil })
addrs, err := CollectAllIfacesAddrs()
testutil.AssertErrorMsg(t, tc.wantErrMsg, err)
assert.Equal(t, tc.wantAddrs, addrs)
})
}
t.Run("internal_error", f... | <mask>
<mask> func TestCollectAllIfacesAddrs(t *testing.T) {
<mask> t.Skip("TODO(e.burkov): Substitute the net.Interfaces.")
<mask>
<mask> addrs, err := CollectAllIfacesAddrs()
<mask> require.NoError(t, err)
<mask>
<mask> assert.NotEmpty(t, addrs)
<mask> }
<mask>
<mask> func TestIsAddrInUse(t *testi... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net_test.go |
substNetInterfaceAddrs(t, func() ([]net.Addr, error) { return nil, errAddrs })
_, err := CollectAllIfacesAddrs()
testutil.AssertErrorMsg(t, wantErrMsg, err)
}) | <mask>
<mask> addrs, err := CollectAllIfacesAddrs()
<mask> require.NoError(t, err)
<mask>
<mask> assert.NotEmpty(t, addrs)
<mask> }
<mask>
<mask> func TestIsAddrInUse(t *testing.T) {
<mask> t.Run("addr_in_use", func(t *testing.T) {
<mask> l, err := net.Listen("tcp", "0.0.0.0:0")
</s> Pull request: 2... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net_test.go |
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> "golang.org/x/sys/windows"
<mask> )
<mask>
<mask> func canBindPrivilegedPorts() (can bool, err error) {
<mask> return aghos.HaveAdminRights()
<mask> }
<mask>
<mask> func ifaceHasStaticIP(string) (ok bool, err error) {
<mask> return false, aghos.Unsupp... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/aghnet/net_windows.go | |
if ok, err := aghnet.CanBindPrivilegedPorts(); !ok || err != nil { | <mask> // Check if the current user permissions are enough to run AdGuard Home
<mask> func checkPermissions() {
<mask> log.Info("Checking if AdGuard Home has necessary permissions")
<mask>
<mask> if runtime.GOOS == "windows" {
<mask> // On Windows we need to have admin rights to run properly
<mask>
<mask>... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/home/home.go |
err := aghnet.CheckPort("tcp", net.IP{127, 0, 0, 1}, defaultPortDNS)
if err != nil {
if errors.Is(err, os.ErrPermission) {
log.Fatal(`Permission check failed. | <mask> log.Fatal("This is the first launch of AdGuard Home. You must run it as Administrator.")
<mask> }
<mask>
<mask> // We should check if AdGuard Home is able to bind to port 53
<mask> ok, err := aghnet.CanBindPort(53)
<mask>
<mask> if ok {
<mask> log.Info("AdGuard Home can bind to port 53")
<mask... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/home/home.go |
https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#running-without-superuser`)
} | <mask>
<mask> You have two options:
<mask> 1. Run AdGuard Home with root privileges
<mask> 2. On Linux you can grant the CAP_NET_BIND_SERVICE capability:
<mask> https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#running-without-superuser`
<mask>
<mask> log.Fatal(msg)
<mask> }
<mask>
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/home/home.go |
log.Info(
"AdGuard failed to bind to port 53: %s\n\n"+
"Please note, that this is crucial for a DNS server to be able to use that port.",
err,
) | <mask> 1. Run AdGuard Home with root privileges
<mask> 2. On Linux you can grant the CAP_NET_BIND_SERVICE capability:
<mask> https://github.com/AdguardTeam/AdGuardHome/wiki/Getting-Started#running-without-superuser`
<mask>
<mask> log.Fatal(msg)
<mask> }
<mask>
<mask> msg := fmt.Sprintf(`AdGuard failed to ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/home/home.go |
log.Info("AdGuard Home can bind to port 53") | <mask>
<mask> log.Fatal(msg)
<mask> }
<mask>
<mask> msg := fmt.Sprintf(`AdGuard failed to bind to port 53 due to %v
<mask>
<mask> Please note, that this is crucial for a DNS server to be able to use that port.`, err)
<mask>
<mask> log.Info(msg)
<mask> }
<mask>
<mask> // Write PID to a file
<mask>... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c70f941bf87b92d819e6a7adf5255bc43404b026 | internal/home/home.go |
github.com/AdguardTeam/urlfilter v0.11.1 | <mask>
<mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.29.1
<mask> github.com/AdguardTeam/golibs v0.4.2
<mask> github.com/AdguardTeam/urlfilter v0.11.0
<mask> github.com/NYTimes/gziphandler v1.1.1
<mask> github.com/fsnotify/fsnotify v1.4.7
<mask> github.com/gobuffalo/packr v1.30.1
<mask> git... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c71b8d3ad2196743d0d82c09e7bad16621729b39 | go.mod |
github.com/AdguardTeam/urlfilter v0.11.1 h1:XQvPVqRPekqIj3xkH7V3NdvMO1InTm8KKQPVcFHFAn0=
github.com/AdguardTeam/urlfilter v0.11.1/go.mod h1:aMuejlNxpWppOVjiEV87X6z0eMf7wsXHTAIWQuylfZY= | <mask> github.com/AdguardTeam/golibs v0.4.0/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardTeam/golibs v0.4.2 h1:7M28oTZFoFwNmp8eGPb3ImmYbxGaJLyQXeIFVHjME0o=
<mask> github.com/AdguardTeam/golibs v0.4.2/go.mod h1:skKsDKIBB7kkFflLJBpfGX+G8QFTx0WKUzB6TIgtUj4=
<mask> github.com/AdguardT... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c71b8d3ad2196743d0d82c09e7bad16621729b39 | go.sum |
log.Debug("Using settings for client %s with IP %s", c.Name, clientAddr) | <mask> if !ok {
<mask> return
<mask> }
<mask>
<mask> log.Debug("Using settings for client with IP %s", clientAddr)
<mask>
<mask> if c.UseOwnBlockedServices {
<mask> Context.dnsFilter.ApplyBlockedServices(setts, c.BlockedServices, false)
<mask> }
<mask>
</s> * use urlfilter v0.11.1
Squashed commi... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c71b8d3ad2196743d0d82c09e7bad16621729b39 | home/dns.go |
func TestSafeSearchCacheYandex(t *testing.T) { | <mask> }
<mask> }
<mask> }
<mask>
<mask> func TestSafeSearchCacheYandex (t *testing.T) {
<mask> d := NewForTest()
<mask> defer d.Destroy()
<mask> domain := "yandex.ru"
<mask>
<mask> // Check host with disabled safesearch
</s> Fix race in safesearch tests </s> remove func TestSafeSearchCacheGoogle (t... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c71d6ed4334287b01b5c41db7597d4e5f060e06a | dnsfilter/dnsfilter_test.go |
var result Result
var err error
| <mask> defer d.Destroy()
<mask> domain := "yandex.ru"
<mask>
<mask> // Check host with disabled safesearch
<mask> result, err = d.CheckHost(domain)
<mask> if err != nil {
<mask> t.Fatalf("Cannot check host due to %s", err)
<mask> }
<mask> if result.IP != nil {
</s> Fix race in safesearch tests </s> ... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c71d6ed4334287b01b5c41db7597d4e5f060e06a | dnsfilter/dnsfilter_test.go |
result, err = d.CheckHost(domain)
if err != nil {
t.Fatalf("Cannot check host due to %s", err)
} | <mask> defer d.Destroy()
<mask> domain := "yandex.ru"
<mask>
<mask> // Check host with disabled safesearch
<mask> result, err := d.CheckHost(domain)
<mask> if result.IP != nil {
<mask> t.Fatalf("SafeSearch is not enabled but there is an answer for `%s` !", domain)
<mask> }
<mask>
<mask> // Enable s... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c71d6ed4334287b01b5c41db7597d4e5f060e06a | dnsfilter/dnsfilter_test.go |
func TestSafeSearchCacheGoogle(t *testing.T) { | <mask> t.Fatalf("Wrong IP in cache for %s safesearch: %s", domain, cachedValue.IP.String())
<mask> }
<mask> }
<mask>
<mask> func TestSafeSearchCacheGoogle (t *testing.T) {
<mask> d := NewForTest()
<mask> defer d.Destroy()
<mask> domain := "www.google.ru"
<mask> result, err := d.CheckHost(domain)
<mask... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c71d6ed4334287b01b5c41db7597d4e5f060e06a | dnsfilter/dnsfilter_test.go |
if err != nil {
t.Fatalf("Cannot check host due to %s", err)
} | <mask> defer d.Destroy()
<mask> domain := "www.google.ru"
<mask> result, err := d.CheckHost(domain)
<mask> if result.IP != nil {
<mask> t.Fatalf("SafeSearch is not enabled but there is an answer!")
<mask> }
<mask>
<mask> // Enable safesearch and check host
</s> Fix race in safesearch tests </s> remove... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c71d6ed4334287b01b5c41db7597d4e5f060e06a | dnsfilter/dnsfilter_test.go |
"yandex.com": "213.180.193.56",
"yandex.ru": "213.180.193.56",
"yandex.ua": "213.180.193.56",
"yandex.by": "213.180.193.56",
"yandex.kz": "213.180.193.56", | <mask> package dnsfilter
<mask>
<mask> var safeSearchDomains = map[string]string{
<mask> "yandex.com": "213.180.193.56",
<mask> "yandex.ru": "213.180.193.56",
<mask> "yandex.ua": "213.180.193.56",
<mask> "yandex.by": "213.180.193.56",
<mask> "yandex.kz": "213.180.193.56",
<mask> "www.yandex.com": "2... | [
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c71d6ed4334287b01b5c41db7597d4e5f060e06a | dnsfilter/safesearch.go |
exchangeAndAssertResponse(t, &client, addr, host, "213.180.193.56") | <mask> addr := s.dnsProxy.Addr(proxy.ProtoUDP)
<mask> client := dns.Client{Net: "udp"}
<mask> yandexDomains := []string{"yandex.com.", "yandex.by.", "yandex.kz.", "yandex.ru.", "yandex.com."}
<mask> for _, host := range yandexDomains {
<mask> exchangeAndAssertResponse(t, client, addr, host, "213.180.193.56")... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c71d6ed4334287b01b5c41db7597d4e5f060e06a | dnsforward/dnsforward_test.go |
exchangeAndAssertResponse(t, &client, addr, host, ip.String()) | <mask>
<mask> // Test safe search for google.
<mask> googleDomains := []string{"www.google.com.", "www.google.com.af.", "www.google.be.", "www.google.by."}
<mask> for _, host := range googleDomains {
<mask> exchangeAndAssertResponse(t, client, addr, host, ip.String())
<mask> }
<mask>
<mask> // Check ag... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c71d6ed4334287b01b5c41db7597d4e5f060e06a | dnsforward/dnsforward_test.go |
exchangeAndAssertResponse(t, &client, addr, "google-public-dns-a.google.com.", "8.8.8.8") | <mask> assert.Equal(t, s.GetAggregatedStats()["blocked_filtering"], float64(len(yandexDomains)+len(googleDomains)))
<mask> assert.Equal(t, s.GetAggregatedStats()["dns_queries"], float64(len(yandexDomains)+len(googleDomains)))
<mask>
<mask> // Do one more exchange
<mask> exchangeAndAssertResponse(t, client, ad... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c71d6ed4334287b01b5c41db7597d4e5f060e06a | dnsforward/dnsforward_test.go |
func exchangeAndAssertResponse(t *testing.T, client *dns.Client, addr net.Addr, host, ip string) { | <mask> assertGoogleAResponse(t, res)
<mask> }
<mask> }
<mask>
<mask> func exchangeAndAssertResponse(t *testing.T, client dns.Client, addr net.Addr, host, ip string) {
<mask> req := createTestMessage(host)
<mask> reply, _, err := client.Exchange(req, addr.String())
<mask> if err != nil {
<mask> t.Fatal... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c71d6ed4334287b01b5c41db7597d4e5f060e06a | dnsforward/dnsforward_test.go |
periodic.Lock() | <mask>
<mask> func initPeriodicStats(periodic *periodicStats, period time.Duration) {
<mask> periodic.entries = statsEntries{}
<mask> periodic.lastRotate = time.Now()
<mask> periodic.period = period
<mask> periodic.Unlock()
</s> Fix race in safesearch tests </s> remove func TestSafeSearchCacheGoogle (t *tes... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c71d6ed4334287b01b5c41db7597d4e5f060e06a | dnsforward/stats.go |
periodic.Unlock() | <mask> periodic.lastRotate = time.Now()
<mask> periodic.period = period
<mask> }
<mask>
<mask> func (s *stats) purgeStats() {
<mask> initPeriodicStats(&s.perSecond, time.Second)
</s> Fix race in safesearch tests </s> remove func TestSafeSearchCacheYandex (t *testing.T) {
</s> add func TestSafeSearchCacheYan... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c71d6ed4334287b01b5c41db7597d4e5f060e06a | dnsforward/stats.go |
stats.RLock()
defer stats.RUnlock()
| <mask> }
<mask>
<mask> func (s *stats) generateMapFromStats(stats *periodicStats, start int, end int) map[string]interface{} {
<mask> // clamp
<mask> start = clamp(start, 0, statsHistoryElements)
<mask> end = clamp(end, 0, statsHistoryElements)
<mask>
</s> Fix race in safesearch tests </s> remove func Test... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c71d6ed4334287b01b5c41db7597d4e5f060e06a | dnsforward/stats.go |
"client_not_in_allowed_clients": "The client is not allowed because it is not in the \"Allowed clients\" list.", | <mask> "original_response": "Original response",
<mask> "click_to_view_queries": "Click to view queries",
<mask> "port_53_faq_link": "Port 53 is often occupied by \"DNSStubListener\" or \"systemd-resolved\" services. Please read <0>this instruction</0> on how to resolve this.",
<mask> "adg_will_drop... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c72cd58f69b71e4981d8b182b2f7d53ea5e30868 | client/src/__locales/en.json |
import { sortIp, countClientsStatistics, findAddressType } from '../helpers/helpers';
import { ADDRESS_TYPES } from '../helpers/constants'; | <mask> import {
<mask> countClientsStatistics, findAddressType, getIpMatchListStatus, sortIp,
<mask> } from '../helpers/helpers';
<mask> import { ADDRESS_TYPES, IP_MATCH_LIST_STATUS } from '../helpers/constants';
<mask>
<mask> describe('getIpMatchListStatus', () => {
<mask> describe('IPv4', () => {
<ma... | [
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"rep... | https://github.com/AdguardTeam/AdGuardHome/commit/c72cd58f69b71e4981d8b182b2f7d53ea5e30868 | client/src/__tests__/helpers.test.js |
<mask> import i18next from 'i18next';
<mask>
<mask> import apiClient from '../api/Api';
<mask> import { addErrorToast, addSuccessToast } from './toasts';
<mask> import { BLOCK_ACTIONS } from '../helpers/constants';
<mask> import { splitByNewLine } from '../helpers/helpers';
<mask>
<mask> export const getAcces... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c72cd58f69b71e4981d8b182b2f7d53ea5e30868 | client/src/actions/access.js | |
export const toggleClientBlock = (ip, disallowed, disallowed_rule) => async (dispatch) => { | <mask> export const toggleClientBlockRequest = createAction('TOGGLE_CLIENT_BLOCK_REQUEST');
<mask> export const toggleClientBlockFailure = createAction('TOGGLE_CLIENT_BLOCK_FAILURE');
<mask> export const toggleClientBlockSuccess = createAction('TOGGLE_CLIENT_BLOCK_SUCCESS');
<mask>
<mask> export const toggleClien... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c72cd58f69b71e4981d8b182b2f7d53ea5e30868 | client/src/actions/access.js |
allowed_clients, blocked_hosts, disallowed_clients = [], | <mask> export const toggleClientBlock = (type, ip) => async (dispatch) => {
<mask> dispatch(toggleClientBlockRequest());
<mask> try {
<mask> const {
<mask> allowed_clients, disallowed_clients, blocked_hosts,
<mask> } = await apiClient.getAccessList();
<mask> let update... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c72cd58f69b71e4981d8b182b2f7d53ea5e30868 | client/src/actions/access.js |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.