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 |
|---|---|---|---|---|
google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= | <mask> google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
<mask> google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
<mask> google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM=
<m... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c08bf86b710e97d5506774fda26358146044edcc | internal/tools/go.sum |
google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
google.golang.org/protobuf ... | <mask> google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM=
<mask> google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
<mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
<mask> gopkg.i... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c08bf86b710e97d5506774fda26358146044edcc | internal/tools/go.sum |
gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= | <mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
<mask> gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
<mask> gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogR... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c08bf86b710e97d5506774fda26358146044edcc | internal/tools/go.sum |
gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= | <mask> gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
<mask> gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
<mask> gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
<mask> gopkg.in/tomb.v1 v1.0.0-2... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c08bf86b710e97d5506774fda26358146044edcc | internal/tools/go.sum |
gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= | <mask> gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
<mask> gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
<mask> gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
<mask> go... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c08bf86b710e97d5506774fda26358146044edcc | internal/tools/go.sum |
gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= | <mask> gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
<mask> gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
<mask> gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
<mask> gopkg.in/yaml.v2 v2... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c08bf86b710e97d5506774fda26358146044edcc | internal/tools/go.sum |
gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.6/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= | <mask> gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
<mask> gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
<mask> gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
<mask> go... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c08bf86b710e97d5506774fda26358146044edcc | internal/tools/go.sum |
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honn... | <mask> gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
<mask> gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
<mask> gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
<mask> gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c08bf86b710e97d5506774fda26358146044edcc | internal/tools/go.sum |
<mask> // +build tools
<mask>
<mask> // Package tools and its main module are a nested internal module containing our
<mask> // development tool dependencies.
<mask> //
<mask> // See https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module.
<mask> package tools
<mask>
<mask> i... | [
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c08bf86b710e97d5506774fda26358146044edcc | internal/tools/tools.go | |
<mask> "io/ioutil"
<mask> "net"
<mask> "net/http"
<mask> "net/url"
<mask> "os"
<mask> "path"
<mask> "path/filepath"
<mask> "strconv"
<mask> "testing"
<mask>
</s> Pull request: all: update go and backend tools
Updates #2275.
Squashed commit of the following:
commit f24c26cd2b49fac00a581936da4ccb1... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c08bf86b710e97d5506774fda26358146044edcc | internal/updater/updater_test.go | |
wd := aghtest.PrepareTestDir(t) | <mask> assert.Nil(t, err)
<mask> }
<mask>
<mask> func TestUpdate(t *testing.T) {
<mask> // TODO(a.garipov): Uncomment and remove the code below in Go 1.15.
<mask> //
<mask> // wd := t.TempDir()
<mask> wd, err := ioutil.TempDir("", "aghtest")
<mask> assert.Nil(t, err)
<mask> t.Cleanup(func() { assert... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c08bf86b710e97d5506774fda26358146044edcc | internal/updater/updater_test.go |
wd := aghtest.PrepareTestDir(t) | <mask> assert.Equal(t, "AdGuardHome.yaml", string(d))
<mask> }
<mask>
<mask> func TestUpdateWindows(t *testing.T) {
<mask> // TODO(a.garipov): Uncomment and remove the code below in Go 1.15.
<mask> //
<mask> // wd := t.TempDir()
<mask> wd, err := ioutil.TempDir("", "aghtest")
<mask> assert.Nil(t, err)... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c08bf86b710e97d5506774fda26358146044edcc | internal/updater/updater_test.go |
err = u.prepare(execPath) | <mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> err = u.prepare(filepath.Base(execPath))
<mask> if err != nil {
<mask> return err
<mask> }
<mask>
<mask> defer u.clean()
</s> Pull request: 4219-updater-1
Merge in DNS/adguard-home from 4219-updater-1 to master
Squashed commit of t... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c098960b399be1240e0f34de5a888fea427cbc52 | internal/updater/updater.go |
func (u *Updater) prepare(exePath string) (err error) { | <mask> return u.versionCheckURL
<mask> }
<mask>
<mask> // prepare fills all necessary fields in Updater object.
<mask> func (u *Updater) prepare(exeName string) (err error) {
<mask> u.updateDir = filepath.Join(u.workDir, fmt.Sprintf("agh-update-%s", u.newVersion))
<mask>
<mask> _, pkgNameOnly := filepath.S... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c098960b399be1240e0f34de5a888fea427cbc52 | internal/updater/updater.go |
u.backupExeName = filepath.Join(u.backupDir, filepath.Base(exePath)) | <mask> if u.goos == "windows" {
<mask> updateExeName = "AdGuardHome.exe"
<mask> }
<mask>
<mask> u.backupExeName = filepath.Join(u.backupDir, exeName)
<mask> u.updateExeName = filepath.Join(u.updateDir, updateExeName)
<mask>
<mask> log.Debug(
<mask> "updater: updating from %s to %s using url: %s",
<... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c098960b399be1240e0f34de5a888fea427cbc52 | internal/updater/updater.go |
u.currentExeName = exePath | <mask> u.newVersion,
<mask> u.packageURL,
<mask> )
<mask>
<mask> u.currentExeName = filepath.Join(u.workDir, exeName)
<mask> _, err = os.Stat(u.currentExeName)
<mask> if err != nil {
<mask> return fmt.Errorf("checking %q: %w", u.currentExeName, err)
<mask> }
<mask>
</s> Pull request: 4219-update... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c098960b399be1240e0f34de5a888fea427cbc52 | internal/updater/updater.go |
exePath := filepath.Join(wd, "AdGuardHome")
yamlPath := filepath.Join(wd, "AdGuardHome.yaml")
readmePath := filepath.Join(wd, "README.md")
licensePath := filepath.Join(wd, "LICENSE.txt")
require.NoError(t, os.WriteFile(exePath, []byte("AdGuardHome"), 0o755))
require.NoError(t, os.WriteFile(yamlPath, []byte("AdGu... | <mask>
<mask> func TestUpdate(t *testing.T) {
<mask> wd := t.TempDir()
<mask>
<mask> require.NoError(t, os.WriteFile(filepath.Join(wd, "AdGuardHome"), []byte("AdGuardHome"), 0o755))
<mask> require.NoError(t, os.WriteFile(filepath.Join(wd, "README.md"), []byte("README.md"), 0o644))
<mask> require.NoError(t,... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c098960b399be1240e0f34de5a888fea427cbc52 | internal/updater/updater_test.go |
u.confName = yamlPath | <mask> Path: "AdGuardHome.tar.gz",
<mask> }
<mask>
<mask> u.workDir = wd
<mask> u.confName = filepath.Join(u.workDir, "AdGuardHome.yaml")
<mask> u.newVersion = "v0.103.1"
<mask> u.packageURL = fakeURL.String()
<mask>
<mask> require.NoError(t, u.prepare("AdGuardHome"))
<mask>
</s> Pull request: 4... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c098960b399be1240e0f34de5a888fea427cbc52 | internal/updater/updater_test.go |
require.NoError(t, u.prepare(exePath)) | <mask> u.confName = filepath.Join(u.workDir, "AdGuardHome.yaml")
<mask> u.newVersion = "v0.103.1"
<mask> u.packageURL = fakeURL.String()
<mask>
<mask> require.NoError(t, u.prepare("AdGuardHome"))
<mask>
<mask> u.currentExeName = filepath.Join(wd, "AdGuardHome")
<mask>
<mask> require.NoError(t, u.downl... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c098960b399be1240e0f34de5a888fea427cbc52 | internal/updater/updater_test.go |
d, err = os.ReadFile(exePath) | <mask>
<mask> assert.Equal(t, "AdGuardHome", string(d))
<mask>
<mask> // check updated files
<mask> d, err = os.ReadFile(filepath.Join(wd, "AdGuardHome"))
<mask> require.NoError(t, err)
<mask>
<mask> assert.Equal(t, "1", string(d))
<mask>
<mask> d, err = os.ReadFile(filepath.Join(wd, "README.md"))
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c098960b399be1240e0f34de5a888fea427cbc52 | internal/updater/updater_test.go |
d, err = os.ReadFile(readmePath) | <mask> require.NoError(t, err)
<mask>
<mask> assert.Equal(t, "1", string(d))
<mask>
<mask> d, err = os.ReadFile(filepath.Join(wd, "README.md"))
<mask> require.NoError(t, err)
<mask>
<mask> assert.Equal(t, "2", string(d))
<mask>
<mask> d, err = os.ReadFile(filepath.Join(wd, "LICENSE.txt"))
</s> Pull... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c098960b399be1240e0f34de5a888fea427cbc52 | internal/updater/updater_test.go |
d, err = os.ReadFile(licensePath) | <mask> require.NoError(t, err)
<mask>
<mask> assert.Equal(t, "2", string(d))
<mask>
<mask> d, err = os.ReadFile(filepath.Join(wd, "LICENSE.txt"))
<mask> require.NoError(t, err)
<mask>
<mask> assert.Equal(t, "3", string(d))
<mask>
<mask> d, err = os.ReadFile(filepath.Join(wd, "AdGuardHome.yaml"))
</... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c098960b399be1240e0f34de5a888fea427cbc52 | internal/updater/updater_test.go |
d, err = os.ReadFile(yamlPath) | <mask> require.NoError(t, err)
<mask>
<mask> assert.Equal(t, "3", string(d))
<mask>
<mask> d, err = os.ReadFile(filepath.Join(wd, "AdGuardHome.yaml"))
<mask> require.NoError(t, err)
<mask>
<mask> assert.Equal(t, "AdGuardHome.yaml", string(d))
<mask> }
<mask>
</s> Pull request: 4219-updater-1
Merge ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c098960b399be1240e0f34de5a888fea427cbc52 | internal/updater/updater_test.go |
exePath := filepath.Join(wd, "AdGuardHome.exe")
yamlPath := filepath.Join(wd, "AdGuardHome.yaml")
readmePath := filepath.Join(wd, "README.md")
licensePath := filepath.Join(wd, "LICENSE.txt")
require.NoError(t, os.WriteFile(exePath, []byte("AdGuardHome.exe"), 0o755))
require.NoError(t, os.WriteFile(yamlPath, []by... | <mask>
<mask> func TestUpdateWindows(t *testing.T) {
<mask> wd := t.TempDir()
<mask>
<mask> require.NoError(t, os.WriteFile(filepath.Join(wd, "AdGuardHome.exe"), []byte("AdGuardHome.exe"), 0o755))
<mask> require.NoError(t, os.WriteFile(filepath.Join(wd, "README.md"), []byte("README.md"), 0o644))
<mask> req... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c098960b399be1240e0f34de5a888fea427cbc52 | internal/updater/updater_test.go |
u.confName = yamlPath | <mask> Path: "AdGuardHome.zip",
<mask> }
<mask>
<mask> u.workDir = wd
<mask> u.confName = filepath.Join(u.workDir, "AdGuardHome.yaml")
<mask> u.newVersion = "v0.103.1"
<mask> u.packageURL = fakeURL.String()
<mask>
<mask> require.NoError(t, u.prepare("AdGuardHome.exe"))
<mask>
</s> Pull request: ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c098960b399be1240e0f34de5a888fea427cbc52 | internal/updater/updater_test.go |
require.NoError(t, u.prepare(exePath)) | <mask> u.confName = filepath.Join(u.workDir, "AdGuardHome.yaml")
<mask> u.newVersion = "v0.103.1"
<mask> u.packageURL = fakeURL.String()
<mask>
<mask> require.NoError(t, u.prepare("AdGuardHome.exe"))
<mask>
<mask> u.currentExeName = filepath.Join(wd, "AdGuardHome.exe")
<mask>
<mask> require.NoError(t,... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c098960b399be1240e0f34de5a888fea427cbc52 | internal/updater/updater_test.go |
d, err = os.ReadFile(exePath) | <mask>
<mask> assert.Equal(t, "AdGuardHome.exe", string(d))
<mask>
<mask> // check updated files
<mask> d, err = os.ReadFile(filepath.Join(wd, "AdGuardHome.exe"))
<mask> require.NoError(t, err)
<mask>
<mask> assert.Equal(t, "1", string(d))
<mask>
<mask> d, err = os.ReadFile(filepath.Join(wd, "README... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c098960b399be1240e0f34de5a888fea427cbc52 | internal/updater/updater_test.go |
d, err = os.ReadFile(readmePath) | <mask> require.NoError(t, err)
<mask>
<mask> assert.Equal(t, "1", string(d))
<mask>
<mask> d, err = os.ReadFile(filepath.Join(wd, "README.md"))
<mask> require.NoError(t, err)
<mask>
<mask> assert.Equal(t, "2", string(d))
<mask>
<mask> d, err = os.ReadFile(filepath.Join(wd, "LICENSE.txt"))
</s> Pull... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c098960b399be1240e0f34de5a888fea427cbc52 | internal/updater/updater_test.go |
d, err = os.ReadFile(licensePath) | <mask> require.NoError(t, err)
<mask>
<mask> assert.Equal(t, "2", string(d))
<mask>
<mask> d, err = os.ReadFile(filepath.Join(wd, "LICENSE.txt"))
<mask> require.NoError(t, err)
<mask>
<mask> assert.Equal(t, "3", string(d))
<mask>
<mask> d, err = os.ReadFile(filepath.Join(wd, "AdGuardHome.yaml"))
</... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c098960b399be1240e0f34de5a888fea427cbc52 | internal/updater/updater_test.go |
d, err = os.ReadFile(yamlPath) | <mask> require.NoError(t, err)
<mask>
<mask> assert.Equal(t, "3", string(d))
<mask>
<mask> d, err = os.ReadFile(filepath.Join(wd, "AdGuardHome.yaml"))
<mask> require.NoError(t, err)
<mask>
<mask> assert.Equal(t, "AdGuardHome.yaml", string(d))
<mask> }
<mask>
</s> Pull request: 4219-updater-1
Merge ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c098960b399be1240e0f34de5a888fea427cbc52 | internal/updater/updater_test.go |
// This use of ReadAll is safe, because request's body is now limited. | <mask> // . Search for another DHCP server running
<mask> // . Check if a static IP is configured for the network interface
<mask> // Respond with results
<mask> func (s *Server) handleDHCPFindActiveServer(w http.ResponseWriter, r *http.Request) {
<mask> body, err := ioutil.ReadAll(r.Body)
<mask> if err != nil ... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/dhcpd/dhcphttp.go |
"github.com/AdguardTeam/AdGuardHome/internal/aghio" | <mask> "os"
<mask> "time"
<mask> "unsafe"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> // GLMode - enable GL-Inet compatibility mode
</s> Pull request: 2305 limit message size
Merge in DNS/adguard-home from 2305-limit-message-size to master
Closes #2305.
Squashed commit of ... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/home/auth_glinet.go |
const (
glTokenTimeoutSeconds = 3600
glCookieName = "Admin-Token"
) | <mask> var GLMode bool
<mask>
<mask> var glFilePrefix = "/tmp/gl_token_"
<mask>
<mask> const glTokenTimeoutSeconds = 3600
<mask> const glCookieName = "Admin-Token"
<mask>
<mask> func glProcessRedirect(w http.ResponseWriter, r *http.Request) bool {
<mask> if !GLMode {
<mask> return false
<mask> }
</s>... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/home/auth_glinet.go |
// MaxFileSize is a maximum file length in bytes.
const MaxFileSize = 1024 * 1024
| <mask> }
<mask>
<mask> func glGetTokenDate(file string) uint32 {
<mask> f, err := os.Open(file)
<mask> if err != nil {
<mask> log.Error("os.Open: %s", err)
<mask> return 0
</s> Pull request: 2305 limit message size
Merge in DNS/adguard-home from 2305-limit-message-size to master
Closes #2305.
Squashed... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/home/auth_glinet.go |
defer f.Close()
fileReadCloser, err := aghio.LimitReadCloser(f, MaxFileSize)
if err != nil {
log.Error("LimitReadCloser: %s", err)
return 0
}
defer fileReadCloser.Close()
| <mask> if err != nil {
<mask> log.Error("os.Open: %s", err)
<mask> return 0
<mask> }
<mask> var dateToken uint32
<mask>
<mask> // This use of ReadAll is now safe, because we limited reader.
<mask> bs, err := ioutil.ReadAll(fileReadCloser)
<mask> if err != nil {
</s> Pull request: 2305 limit message... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/home/auth_glinet.go |
// This use of ReadAll is now safe, because we limited reader.
bs, err := ioutil.ReadAll(fileReadCloser) | <mask> log.Error("os.Open: %s", err)
<mask> return 0
<mask> }
<mask> var dateToken uint32
<mask> bs, err := ioutil.ReadAll(f)
<mask> if err != nil {
<mask> log.Error("ioutil.ReadAll: %s", err)
<mask> return 0
<mask> }
<mask> buf := bytes.NewBuffer(bs)
</s> Pull request: 2305 limit message size
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/home/auth_glinet.go |
<mask>
<mask> import (
<mask> "encoding/json"
<mask> "fmt"
<mask> "io/ioutil"
<mask> "net/http"
<mask> )
<mask>
<mask> type clientJSON struct {
<mask> IDs []string `json:"ids"`
</s> Pull request: 2305 limit message size
Merge in DNS/adguard-home from 2305-limit-message-size to master
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/home/clients_http.go | |
<mask> }
<mask>
<mask> // Add a new client
<mask> func (clients *clientsContainer) handleAddClient(w http.ResponseWriter, r *http.Request) {
<mask> body, err := ioutil.ReadAll(r.Body)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "failed to read request body: %s", err)
<mask> return
... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/home/clients_http.go | |
err := json.NewDecoder(r.Body).Decode(&cj) | <mask> return
<mask> }
<mask>
<mask> cj := clientJSON{}
<mask> err = json.Unmarshal(body, &cj)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "JSON parse: %s", err)
<mask> return
<mask> }
<mask>
</s> Pull request: 2305 limit message size
Merge in DNS/adguard-home from 2305-li... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/home/clients_http.go |
httpError(w, http.StatusBadRequest, "failed to process request body: %s", err)
| <mask>
<mask> cj := clientJSON{}
<mask> err = json.Unmarshal(body, &cj)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "JSON parse: %s", err)
<mask> return
<mask> }
<mask>
<mask> c, err := jsonToClient(cj)
<mask> if err != nil {
</s> Pull request: 2305 limit message size
Merge... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/home/clients_http.go |
cj := clientJSON{}
err := json.NewDecoder(r.Body).Decode(&cj) | <mask> }
<mask>
<mask> // Remove client
<mask> func (clients *clientsContainer) handleDelClient(w http.ResponseWriter, r *http.Request) {
<mask> body, err := ioutil.ReadAll(r.Body)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "failed to read request body: %s", err)
<mask> return
<ma... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/home/clients_http.go |
httpError(w, http.StatusBadRequest, "failed to process request body: %s", err)
| <mask> // Remove client
<mask> func (clients *clientsContainer) handleDelClient(w http.ResponseWriter, r *http.Request) {
<mask> body, err := ioutil.ReadAll(r.Body)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "failed to read request body: %s", err)
<mask> return
<mask> }
<mask>
<m... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/home/clients_http.go |
if len(cj.Name) == 0 {
httpError(w, http.StatusBadRequest, "client's name must be non-empty")
| <mask> httpError(w, http.StatusBadRequest, "failed to read request body: %s", err)
<mask> return
<mask> }
<mask>
<mask> cj := clientJSON{}
<mask> err = json.Unmarshal(body, &cj)
<mask> if err != nil || len(cj.Name) == 0 {
<mask> httpError(w, http.StatusBadRequest, "JSON parse: %s", err)
<mask> ret... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/home/clients_http.go |
dj := updateJSON{}
err := json.NewDecoder(r.Body).Decode(&dj) | <mask> }
<mask>
<mask> // Update client's properties
<mask> func (clients *clientsContainer) handleUpdateClient(w http.ResponseWriter, r *http.Request) {
<mask> body, err := ioutil.ReadAll(r.Body)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "failed to read request body: %s", err)
<mas... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/home/clients_http.go |
httpError(w, http.StatusBadRequest, "failed to process request body: %s", err) | <mask> // Update client's properties
<mask> func (clients *clientsContainer) handleUpdateClient(w http.ResponseWriter, r *http.Request) {
<mask> body, err := ioutil.ReadAll(r.Body)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "failed to read request body: %s", err)
<mask> return
<mask>... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/home/clients_http.go |
<mask> httpError(w, http.StatusBadRequest, "failed to read request body: %s", err)
<mask> return
<mask> }
<mask>
<mask> var dj updateJSON
<mask> err = json.Unmarshal(body, &dj)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "JSON parse: %s", err)
<mask> return
<mask> }
<mask>... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/home/clients_http.go | |
// This use of ReadAll is safe, because request's body is now limited. | <mask> }
<mask> }
<mask>
<mask> func (f *Filtering) handleFilteringSetRules(w http.ResponseWriter, r *http.Request) {
<mask> body, err := ioutil.ReadAll(r.Body)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "Failed to read request body: %s", err)
<mask> return
<mask> }
<mask>
</... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/home/control_filtering.go |
// This use of ReadAll is safe, because request's body is now limited. | <mask> }
<mask>
<mask> func handleI18nChangeLanguage(w http.ResponseWriter, r *http.Request) {
<mask> body, err := ioutil.ReadAll(r.Body)
<mask> if err != nil {
<mask> msg := fmt.Sprintf("failed to read request body: %s", err)
<mask> log.Println(msg)
<mask> http.Error(w, msg, http.StatusBadRequest)
</... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/home/i18n.go |
<mask> golog "log"
<mask> "net"
<mask> "net/http"
<mask> "strconv"
<mask> "strings"
<mask> "sync"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/util"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/NYTimes/gziphandler"
</s> Pull request: 2305 limit message size
Merge in ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/home/web.go | |
Handler: withMiddlewares(http.DefaultServeMux, filterPProf, limitRequestBody), | <mask> address := net.JoinHostPort(web.conf.BindHost, strconv.Itoa(web.conf.BindPort))
<mask> web.httpServer = &http.Server{
<mask> ErrorLog: web.errLogger,
<mask> Addr: address,
<mask> Handler: filterPPROF(http.DefaultServeMux),
<mask> }
<mask> err := web.httpServer.ListenAndServe()
<mask... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/home/web.go |
<mask> // We use ErrServerClosed as a sign that we need to rebind on new address, so go back to the start of the loop
<mask> }
<mask> }
<mask>
<mask> // TODO(a.garipov): We currently have to use this, because everything registers
<mask> // its HTTP handlers in http.DefaultServeMux. In the future, refactor ou... | [
"keep",
"keep",
"keep",
"keep",
"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/c129361e55aea50c3454feca90025937261214ee | internal/home/web.go | |
"github.com/AdguardTeam/AdGuardHome/internal/aghio" | <mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/util"
<mask>
<mask> "github.com/AdguardTeam/golibs/cache"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
</s> Pull request: 2305 limit message size
Merge in DNS/adguard-home from 2305-limit-message-size to ma... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/home/whois.go |
// MaxConnReadSize is an upper limit in bytes for reading from net.Conn.
const MaxConnReadSize = 64 * 1024
| <mask> }
<mask>
<mask> // Send request to a server and receive the response
<mask> func (w *Whois) query(target, serverAddr string) (string, error) {
<mask> addr, _, _ := net.SplitHostPort(serverAddr)
<mask> if addr == "whois.arin.net" {
<mask> target = "n + " + target
<mask> }
</s> Pull request: 2305 li... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/home/whois.go |
connReadCloser, err := aghio.LimitReadCloser(conn, MaxConnReadSize)
if err != nil {
return "", err
}
defer connReadCloser.Close()
| <mask> return "", err
<mask> }
<mask> defer conn.Close()
<mask>
<mask> _ = conn.SetReadDeadline(time.Now().Add(time.Duration(w.timeoutMsec) * time.Millisecond))
<mask> _, err = conn.Write([]byte(target + "\r\n"))
<mask> if err != nil {
<mask> return "", err
<mask> }
<mask>
</s> Pull request: 2305... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/home/whois.go |
// This use of ReadAll is now safe, because we limited the conn Reader.
data, err := ioutil.ReadAll(connReadCloser) | <mask> if err != nil {
<mask> return "", err
<mask> }
<mask>
<mask> data, err := ioutil.ReadAll(conn)
<mask> if err != nil {
<mask> return "", err
<mask> }
<mask>
<mask> return string(data), nil
</s> Pull request: 2305 limit message size
Merge in DNS/adguard-home from 2305-limit-message-size to ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/home/whois.go |
"github.com/AdguardTeam/AdGuardHome/internal/aghio" | <mask> "io/ioutil"
<mask> "strings"
<mask> "time"
<mask> )
<mask>
<mask> const versionCheckPeriod = 8 * 60 * 60
<mask>
<mask> // VersionInfo - VersionInfo
<mask> type VersionInfo struct {
</s> Pull request: 2305 limit message size
Merge in DNS/adguard-home from 2305-limit-message-size to master
Closes ... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/update/check.go |
// MaxResponseSize is responses on server's requests maximum length in bytes.
const MaxResponseSize = 64 * 1024
| <mask> SelfUpdateMinVersion string // Min version starting with which we can auto-update
<mask> CanAutoUpdate bool // If true - we can auto-update
<mask> }
<mask>
<mask> // GetVersionResponse - downloads version.json (if needed) and deserializes it
<mask> func (u *Updater) GetVersionResponse(forceRech... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/update/check.go |
if err != nil {
return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %w", u.VersionURL, err) | <mask> return u.parseVersionResponse(u.versionJSON)
<mask> }
<mask>
<mask> resp, err := u.Client.Get(u.VersionURL)
<mask> if resp != nil && resp.Body != nil {
<mask> defer resp.Body.Close()
<mask> }
<mask>
<mask> if err != nil {
<mask> return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %w", ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/update/check.go |
defer resp.Body.Close() | <mask> return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %w", u.VersionURL, err)
<mask> }
<mask>
<mask> resp.Body, err = aghio.LimitReadCloser(resp.Body, MaxResponseSize)
<mask> if err != nil {
<mask> return VersionInfo{}, fmt.Errorf("updater: LimitReadCloser: %w", err)
<mask> }
<mask> defer res... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/update/check.go |
resp.Body, err = aghio.LimitReadCloser(resp.Body, MaxResponseSize) | <mask> }
<mask> defer resp.Body.Close()
<mask>
<mask> if err != nil {
<mask> return VersionInfo{}, fmt.Errorf("updater: LimitReadCloser: %w", err)
<mask> }
<mask> defer resp.Body.Close()
</s> Pull request: 2305 limit message size
Merge in DNS/adguard-home from 2305-limit-message-size to master
Closes ... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/update/check.go |
return VersionInfo{}, fmt.Errorf("updater: LimitReadCloser: %w", err) | <mask> defer resp.Body.Close()
<mask> }
<mask>
<mask> if err != nil {
<mask> return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %w", u.VersionURL, err)
<mask> }
<mask>
<mask> body, err := ioutil.ReadAll(resp.Body)
<mask> if err != nil {
<mask> return VersionInfo{}, fmt.Errorf("updater: HTTP ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/update/check.go |
defer resp.Body.Close() | <mask> resp.Body, err = aghio.LimitReadCloser(resp.Body, MaxResponseSize)
<mask> if err != nil {
<mask> return VersionInfo{}, fmt.Errorf("updater: LimitReadCloser: %w", err)
<mask> }
<mask>
<mask> // This use of ReadAll is safe, because we just limited the appropriate
<mask> // ReadCloser.
<mask> body,... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/update/check.go |
// This use of ReadAll is safe, because we just limited the appropriate
// ReadCloser. | <mask> return VersionInfo{}, fmt.Errorf("updater: LimitReadCloser: %w", err)
<mask> }
<mask> defer resp.Body.Close()
<mask>
<mask> body, err := ioutil.ReadAll(resp.Body)
<mask> if err != nil {
<mask> return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %w", u.VersionURL, err)
<mask> }
<mask>
</s... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/update/check.go |
"github.com/AdguardTeam/AdGuardHome/internal/aghio" | <mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/util"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
</s> Pull request: 2305 limit message size
Merge in DNS/adguard-home from 2305-limit-message-size to master
Closes #2305.
Squashed commit of the following:
commit 6ed... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/update/updater.go |
// MaxPackageFileSize is a maximum package file length in bytes. The largest
// package whose size is limited by this constant currently has the size of
// approximately 9 MiB.
const MaxPackageFileSize = 32 * 1024 * 1024
| <mask> _ = os.RemoveAll(u.updateDir)
<mask> }
<mask>
<mask> // Download package file and save it to disk
<mask> func (u *Updater) downloadPackageFile(url string, filename string) error {
<mask> resp, err := u.Client.Get(url)
<mask> if err != nil {
<mask> return fmt.Errorf("http request failed: %w", err)
... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/update/updater.go |
defer resp.Body.Close()
resp.Body, err = aghio.LimitReadCloser(resp.Body, MaxPackageFileSize)
if err != nil {
return fmt.Errorf("http request failed: %w", err) | <mask> resp, err := u.Client.Get(url)
<mask> if err != nil {
<mask> return fmt.Errorf("http request failed: %w", err)
<mask> }
<mask> if resp != nil && resp.Body != nil {
<mask> defer resp.Body.Close()
<mask> }
<mask>
<mask> log.Debug("updater: reading HTTP body")
<mask> body, err := ioutil.ReadAl... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/update/updater.go |
defer resp.Body.Close() | <mask> return fmt.Errorf("http request failed: %w", err)
<mask> }
<mask>
<mask> log.Debug("updater: reading HTTP body")
<mask> // This use of ReadAll is now safe, because we limited body's Reader.
<mask> body, err := ioutil.ReadAll(resp.Body)
<mask> if err != nil {
<mask> return fmt.Errorf("ioutil.Rea... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/update/updater.go |
// This use of ReadAll is now safe, because we limited body's Reader. | <mask>
<mask> log.Debug("updater: reading HTTP body")
<mask> body, err := ioutil.ReadAll(resp.Body)
<mask> if err != nil {
<mask> return fmt.Errorf("ioutil.ReadAll() failed: %w", err)
<mask> }
</s> Pull request: 2305 limit message size
Merge in DNS/adguard-home from 2305-limit-message-size to master
Clo... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c129361e55aea50c3454feca90025937261214ee | internal/update/updater.go |
{formatClientCell(row, true, false)} | <mask>
<mask> return (
<mask> <>
<mask> <div className="logs__row logs__row--overflow logs__row--column">
<mask> {formatClientCell(row, true)}
<mask> </div>
<mask> {ipMatchListStatus !== IP_MATCH_LIST_STATUS.CIDR
<mask> && renderBlocki... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c131ac445acae449789dd14f452e740b770321db | client/src/components/Dashboard/Clients.js |
export const formatClientCell = (row, isDetailed = false, isLogs = true) => { | <mask> })
<mask> );
<mask> };
<mask>
<mask> export const formatClientCell = (row, isDetailed = false) => {
<mask> const { value, original: { info } } = row;
<mask> let whoisContainer = '';
<mask> let nameContainer = value;
<mask>
<mask> if (info) {
</s> Merge: - client: fix ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c131ac445acae449789dd14f452e740b770321db | client/src/helpers/formatClientCell.js |
if (isLogs) {
nameContainer = !whois_info && isDetailed
? (
<small title={value}>{value}</small>
) : (
<div className="logs__text logs__text--nowrap" title={`${name} (${value})`}>
... | <mask> if (info) {
<mask> const { name, whois_info } = info;
<mask>
<mask> if (name) {
<mask> nameContainer = !whois_info && isDetailed
<mask> ? <small title={value}>{value}</small>
<mask> : <div className="logs__text logs__text--nowrap" title={`${... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c131ac445acae449789dd14f452e740b770321db | client/src/helpers/formatClientCell.js |
count := 0 | <mask> }
<mask> defer file.Close()
<mask>
<mask> scanner := bufio.NewScanner(file)
<mask> for scanner.Scan() {
<mask> text := scanner.Text()
<mask> if d.parseEtcHosts(text) {
<mask> continue
<mask> }
</s> coredns plugin -- give feedback how many rules were in rulefile | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c143e3d57fe191b39f219b7dd2e8ffdfc706f1ae | coredns_plugin/coredns_plugin.go |
count++ | <mask> }
<mask> if err != nil {
<mask> return nil, err
<mask> }
<mask> }
<mask> log.Printf("Added %d rules from %s", count, filterFileName)
<mask>
<mask> if err = scanner.Err(); err != nil {
</s> coredns plugin -- give feedback how many rules were in rulefile | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c143e3d57fe191b39f219b7dd2e8ffdfc706f1ae | coredns_plugin/coredns_plugin.go |
log.Printf("Added %d rules from %s", count, filterFileName) | <mask> return nil, err
<mask> }
<mask> count++
<mask> }
<mask>
<mask> if err = scanner.Err(); err != nil {
<mask> return nil, err
<mask> }
<mask>
</s> coredns plugin -- give feedback how many rules were in rulefile | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c143e3d57fe191b39f219b7dd2e8ffdfc706f1ae | coredns_plugin/coredns_plugin.go |
TLS tlsConfig `yaml:"tls"` | <mask> AuthName string `yaml:"auth_name"`
<mask> AuthPass string `yaml:"auth_pass"`
<mask> Language string `yaml:"language"` // two-letter ISO 639-1 language code
<mask> DNS dnsConfig `yaml:"dns"`
<mask> Filters []filter `yaml:"filters"`
<mask... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c19416bf8e836ebba204d0e6def424c9bacb645c | config.go |
<mask> DNS dnsConfig `yaml:"dns"`
<mask> Filters []filter `yaml:"filters"`
<mask> UserRules []string `yaml:"user_rules"`
<mask> DHCP dhcpd.ServerConfig `yaml:"dhcp"`
<mask> TLS tlsConfig `yaml:"tls"`
<mask>
<mask> logSettings `yaml:",inline"`
<mask... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c19416bf8e836ebba204d0e6def424c9bacb645c | config.go | |
ServerName string `yaml:"server_name" json:"server_name,omitempty"`
ForceHTTPS bool `yaml:"force_https" json:"force_https,omitempty"`
PortHTTPS int `yaml:"port_https" json:"port_https,omitempty"`
PortDNSOverTLS int `yaml:"port_dns_over_tls" json:"port_dns_over_tls,omitempty"` | <mask> var defaultDNS = []string{"tls://1.1.1.1", "tls://1.0.0.1"}
<mask>
<mask> // field ordering is important -- yaml fields will mirror ordering from here
<mask> type tlsConfig struct {
<mask> ServerName string `yaml:"server_name" json:"server_name"`
<mask> ForceHTTPS bool `yaml:"force_https" ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c19416bf8e836ebba204d0e6def424c9bacb645c | config.go |
"all_queries": "All queries", | <mask> "list_updated_plural": "{{count}} lists updated",
<mask> "dnssec_enable": "Enable DNSSEC",
<mask> "dnssec_enable_desc": "Set DNSSEC flag in the outcoming DNS queries and check the result (DNSSEC-enabled resolver is required)",
<mask> "validated_with_dnssec": "Validated with DNSSEC",
<mask> ... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c1e56c837b483873146a6d6218a15fe3c4b8cb7a | client/src/__locales/en.json |
<mask> "client_blocked": "Klien \"{{ip}}\" sukses di blokir",
<mask> "client_unblocked": "Klien \"{{ip}}\" sukses di unblock",
<mask> "static_ip": "Alamat IP statis",
<mask> "validated_with_dnssec": "Tervalidasi dengan DNSSEC",
<mask> "show_all_responses": "Semua respon",
<mask> "show_bloc... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c1e56c837b483873146a6d6218a15fe3c4b8cb7a | client/src/__locales/id.json | |
"choose_blocklist": "Scegli liste di blocco",
"choose_allowlist": "Scegli liste di autorizzazione", | <mask> "new_allowlist": "Nuova lista dei consentiti",
<mask> "edit_blocklist": "Modifica lista di blocco",
<mask> "edit_allowlist": "Modifica lista dei consentiti",
<mask> "enter_valid_blocklist": "Inserisci un URL valido nella lista di blocco.",
<mask> "enter_valid_allowlist": "Inserisci un UR... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c1e56c837b483873146a6d6218a15fe3c4b8cb7a | client/src/__locales/it.json |
"response_code": "Codice di risposta", | <mask> "type_table_header": "Tipo",
<mask> "response_table_header": "Risposta",
<mask> "client_table_header": "Client",
<mask> "empty_response_status": "Vuoto",
<mask> "show_all_filter_type": "Mostra tutti",
<mask> "show_filtered_type": "Mostra filtrati",
<mask> "no_logs_found": "Ness... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c1e56c837b483873146a6d6218a15fe3c4b8cb7a | client/src/__locales/it.json |
"choose_blocklist": "Blokkeringslijsten selecteren",
"choose_allowlist": "Toestemmingslijsten selecteren", | <mask> "new_blocklist": "Nieuwe blokkeerlijst",
<mask> "new_allowlist": "Nieuwe toestemmingslijst",
<mask> "edit_blocklist": "Blokkeerlijst beheren",
<mask> "edit_allowlist": "Toestemmingslijst beheren",
<mask> "enter_valid_blocklist": "Voer een geldige URL in voor de blokkeerlijst.",
<mask> ... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c1e56c837b483873146a6d6218a15fe3c4b8cb7a | client/src/__locales/nl.json |
"blocked_by_cname_or_ip": "Geblokkeerd via CNAME of IP", | <mask> "whois": "Whois",
<mask> "filtering_rules_learn_more": "<0>Meer informatie</0> over het maken van je eigen host lijsten.",
<mask> "blocked_by_response": "Geblokkeerd door CNAME of IP als antwoord",
<mask> "try_again": "Probeer opnieuw",
<mask> "domain_desc": "Voer de domeinnaam of wildca... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c1e56c837b483873146a6d6218a15fe3c4b8cb7a | client/src/__locales/nl.json |
"rewrite_ip_address": "IP adres: gebruik dit IP in een A of AAAA antwoord",
"rewrite_domain_name": "Domeinnaam: een CNAME record toevoegen",
"rewrite_A": "<0>A</0>: speciale waarde, <0>A</0> records uit de upstream bewaren",
"rewrite_AAAA": "<0>AAAA</0>: speciale waarde, <0>AAAA</0> records uit de upstr... | <mask> "domain_desc": "Voer de domeinnaam of wildcard in die herschreven moet worden.",
<mask> "example_rewrite_domain": "herschrijf reacties uitsluitend voor deze domeinnaam.",
<mask> "example_rewrite_wildcard": "herschrijf reacties voor alle subdomeinen van <0>example.org</0>.",
<mask> "disable_ip... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c1e56c837b483873146a6d6218a15fe3c4b8cb7a | client/src/__locales/nl.json |
"choose_from_list": "Uit de lijst selecteren",
"add_custom_list": "Aangepaste lijst toevoegen", | <mask> "check_desc": "Controleer of de hostnaam wordt gefilterd",
<mask> "check": "Controleren",
<mask> "form_enter_host": "Voer een hostnaam in",
<mask> "filtered_custom_rules": "Gefilterd door aangepaste filterregels",
<mask> "host_whitelisted": "De host staat op de toestemmingslijst",
<mask... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c1e56c837b483873146a6d6218a15fe3c4b8cb7a | client/src/__locales/nl.json |
"milliseconds_abbreviation": "ms",
"cache_size": "Cache grootte",
"cache_size_desc": "DNS cache grootte (in bytes)",
"cache_ttl_min_override": "Minimale TTL overschrijven",
"cache_ttl_max_override": "Maximale TTL overschrijven",
"enter_cache_size": "Cache grootte invoeren",
"enter_cache_ttl_... | <mask> "filtered": "Gefilterd",
<mask> "rewritten": "Herschreven",
<mask> "safe_search": "Veilig zoeken",
<mask> "blocklist": "Blokkeerlijst",
<mask> "milliseconds_abbreviation": "ms"
<mask> } </s> + client: Update locales
Squashed commit of the following:
commit 6d743bb15974a85fedb004a3c639... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c1e56c837b483873146a6d6218a15fe3c4b8cb7a | client/src/__locales/nl.json |
"enter_url_or_path_hint": "Skriv inn listens URL eller fulle filbane", | <mask> "add_blocklist": "Legg til blokkeringsliste",
<mask> "add_allowlist": "Legg til hviteliste",
<mask> "cancel_btn": "Avbryt",
<mask> "enter_name_hint": "Skriv inn navn",
<mask> "check_updates_btn": "Se etter oppdateringer",
<mask> "new_blocklist": "Ny blokkeringsliste",
<mask> "n... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c1e56c837b483873146a6d6218a15fe3c4b8cb7a | client/src/__locales/no.json |
"choose_blocklist": "Velg blokkeringslister", | <mask> "edit_blocklist": "Rediger blokkeringsliste",
<mask> "edit_allowlist": "Rediger hviteliste",
<mask> "enter_valid_blocklist": "Skriv inn en gyldig nettadresse til blokkeringslisten.",
<mask> "enter_valid_allowlist": "Skriv inn en gyldig nettadresse til hvitelisten.",
<mask> "form_error_ur... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c1e56c837b483873146a6d6218a15fe3c4b8cb7a | client/src/__locales/no.json |
"domain_or_client": "Domene eller klient", | <mask> "time_table_header": "Tidspunkt",
<mask> "date": "Dato",
<mask> "domain_name_table_header": "Domenenavn",
<mask> "type_table_header": "Type",
<mask> "response_table_header": "Respons",
<mask> "response_code": "Svarkode",
<mask> "client_table_header": "Klient",
<mask> "empt... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c1e56c837b483873146a6d6218a15fe3c4b8cb7a | client/src/__locales/no.json |
"response_code": "Svarkode", | <mask> "domain_name_table_header": "Domenenavn",
<mask> "domain_or_client": "Domene eller klient",
<mask> "type_table_header": "Type",
<mask> "response_table_header": "Respons",
<mask> "client_table_header": "Klient",
<mask> "empty_response_status": "Tomt innhold",
<mask> "show_all_fi... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c1e56c837b483873146a6d6218a15fe3c4b8cb7a | client/src/__locales/no.json |
"choose_blocklist": "Izberite sezname za zaviranje",
"choose_allowlist": "Izberite sezname dovoljenih", | <mask> "new_allowlist": "Nov seznam dovoljenih",
<mask> "edit_blocklist": "Uredi seznam nedovoljenih",
<mask> "edit_allowlist": "Uredi seznam dovoljenih",
<mask> "enter_valid_blocklist": "Vnesite veljaven URL naslov seznama nedovoljenih.",
<mask> "enter_valid_allowlist": "Vnesite veljaven URL n... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c1e56c837b483873146a6d6218a15fe3c4b8cb7a | client/src/__locales/sl.json |
"choose_from_list": "Izberi s seznama",
"add_custom_list": "Dodaj seznam po meri", | <mask> "form_enter_host": "Vnesite ime gostitelja",
<mask> "filtered_custom_rules": "Filtrirano s pravili filtriranja po meri",
<mask> "host_whitelisted": "Gostitelj je na seznamu dovoljenih",
<mask> "check_ip": "IP naslovi: {{ip}}",
<mask> "check_cname": "CNAME: {{cname}}",
<mask> "check_... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c1e56c837b483873146a6d6218a15fe3c4b8cb7a | client/src/__locales/sl.json |
label: 'all_queries', | <mask>
<mask> export const RESPONSE_FILTER = {
<mask> ALL: {
<mask> query: 'all',
<mask> label: 'show_all_responses',
<mask> },
<mask> FILTERED: {
<mask> query: 'filtered',
<mask> label: 'filtered',
<mask> },
</s> + client: Update locales
Squashed commit of t... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c1e56c837b483873146a6d6218a15fe3c4b8cb7a | client/src/helpers/constants.js |
"time" | <mask> "runtime"
<mask> "strconv"
<mask> "strings"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/util"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/a... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/controlinstall.go |
// shutdownTimeout is the timeout for shutting HTTP server down operation.
const shutdownTimeout = 5 * time.Second
| <mask> dst.DNS.BindHost = src.DNS.BindHost
<mask> dst.DNS.Port = src.DNS.Port
<mask> }
<mask>
<mask> // Apply new configuration, start DNS server, restart Web server
<mask> func (web *Web) handleInstallConfigure(w http.ResponseWriter, r *http.Request) {
<mask> newSettings := applyConfigReq{}
<mask> err := ... | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/controlinstall.go |
// TODO(e.burkov): StartMods() should be put in a separate goroutine at
// the moment we'll allow setting up TLS in the initial configuration or
// the configuration itself will use HTTPS protocol, because the
// underlying functions potentially restart the HTTPS server. | <mask> config.DNS.BindHost = newSettings.DNS.IP
<mask> config.DNS.Port = newSettings.DNS.Port
<mask>
<mask> err = StartMods()
<mask> if err != nil {
<mask> Context.firstRun = true
<mask> copyInstallSettings(&config, &curConfig)
<mask> httpError(w, http.StatusInternalServerError, "%s", err)
</s> Pull... | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/controlinstall.go |
// The Shutdown() method of (*http.Server) needs to be called in a
// separate goroutine, because it waits until all requests are handled
// and will be blocked by it's own caller. | <mask> if f, ok := w.(http.Flusher); ok {
<mask> f.Flush()
<mask> }
<mask>
<mask> // this needs to be done in a goroutine because Shutdown() is a blocking call, and it will block
<mask> // until all requests are finished, and _we_ are inside a request right now, so it will block indefinitely
<mask> if re... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/controlinstall.go |
ctx, cancel := context.WithTimeout(context.Background(), shutdownTimeout)
shut := func(srv *http.Server) {
defer cancel()
err := srv.Shutdown(ctx)
if err != nil {
log.Debug("error while shutting down HTTP server: %s", err)
}
}
go shut(web.httpServer) | <mask>
<mask> // this needs to be done in a goroutine because Shutdown() is a blocking call, and it will block
<mask> // until all requests are finished, and _we_ are inside a request right now, so it will block indefinitely
<mask> if restartHTTP {
<mask> go func() {
<mask> _ = web.httpServer.Shutdown(co... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/controlinstall.go |
go shut(web.httpServerBeta) | <mask> go func() {
<mask> _ = web.httpServer.Shutdown(context.TODO())
<mask> }()
<mask> if web.httpServerBeta != nil {
<mask> go func() {
<mask> _ = web.httpServerBeta.Shutdown(context.TODO())
<mask> }()
<mask> }
<mask> }
<mask> }
<mask>
<mask> func (web *Web) registerInstallHandlers(... | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/controlinstall.go |
"context" | <mask>
<mask> import (
<mask> "encoding/json"
<mask> "errors"
<mask> "net/http"
<mask> "os"
<mask> "os/exec"
<mask> "path/filepath"
</s> Pull request: 2552 rm context.TODO() instances
Merge in DNS/adguard-home from 2552-context to master
Closes #2552.
Squashed commit of the following:
commit 3d1cef3... | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/c215b820046e6da5fd50c06149c904cd509066c8 | internal/home/controlupdate.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.