docstring_tokens
stringlengths 0
76.5k
| code_tokens
stringlengths 75
1.81M
| label_window
sequencelengths 4
2.12k
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|---|
log.Error("Couldn't close gzip writer: %s", err) | <mask> return err
<mask> }
<mask>
<mask> if err = zw.Close(); err != nil {
<mask> log.Printf("Couldn't close gzip writer: %s", err)
<mask> return err
<mask> }
<mask> } else {
<mask> zb = b
<mask> }
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("Failed to create gzip reader: %s", err)
</s> add log.Error("Failed to create gzip reader: %s", err) </s> remove log.Printf("Couldn't compress to gzip: %s", err)
</s> add log.Error("Couldn't compress to gzip: %s", err) </s> remove log.Printf("Couldn't save YAML config: %s", err)
</s> add log.Error("Couldn't save YAML config: %s", err) </s> remove log.Printf("Couldn't stop DNS server: %s", err)
</s> add log.Error("Couldn't stop DNS server: %s", err) </s> remove log.Println(err)
</s> add log.Info("%v", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | dnsforward/querylog_file.go |
log.Error("failed to create file \"%s\": %s", filename, err) | <mask> fileWriteLock.Lock()
<mask> defer fileWriteLock.Unlock()
<mask> f, err := os.OpenFile(filename, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644)
<mask> if err != nil {
<mask> log.Printf("failed to create file \"%s\": %s", filename, err)
<mask> return err
<mask> }
<mask> defer f.Close()
<mask>
<mask> n, err := f.Write(zb.Bytes())
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("Couldn't write to file: %s", err)
</s> add log.Error("Couldn't write to file: %s", err) </s> remove log.Printf("Failed to open file \"%s\": %s", file, err)
</s> add log.Error("Failed to open file \"%s\": %s", file, err) </s> remove log.Printf("Failed to create gzip reader: %s", err)
</s> add log.Error("Failed to create gzip reader: %s", err) </s> remove stdlog.SetOutput(file)
</s> add log.SetOutput(file) </s> remove log.Printf("Saving querylog to file failed: %s", err)
</s> add log.Error("Saving querylog to file failed: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | dnsforward/querylog_file.go |
log.Error("Couldn't write to file: %s", err) | <mask> defer f.Close()
<mask>
<mask> n, err := f.Write(zb.Bytes())
<mask> if err != nil {
<mask> log.Printf("Couldn't write to file: %s", err)
<mask> return err
<mask> }
<mask>
<mask> log.Printf("ok \"%s\": %v bytes written", filename, n)
<mask>
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("ok \"%s\": %v bytes written", filename, n)
</s> add log.Debug("ok \"%s\": %v bytes written", filename, n) </s> remove log.Printf("failed to create file \"%s\": %s", filename, err)
</s> add log.Error("failed to create file \"%s\": %s", filename, err) </s> remove log.Printf("Failed to open file \"%s\": %s", file, err)
</s> add log.Error("Failed to open file \"%s\": %s", file, err) </s> remove log.Printf("Couldn't generate YAML file: %s", err)
</s> add log.Error("Couldn't generate YAML file: %s", err) </s> remove log.Tracef("Writing YAML file: %s", configFile)
</s> add log.Debug("Writing YAML file: %s", configFile) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | dnsforward/querylog_file.go |
log.Debug("ok \"%s\": %v bytes written", filename, n) | <mask> log.Printf("Couldn't write to file: %s", err)
<mask> return err
<mask> }
<mask>
<mask> log.Printf("ok \"%s\": %v bytes written", filename, n)
<mask>
<mask> return nil
<mask> }
<mask>
<mask> func checkBuffer(buffer []*logEntry, b bytes.Buffer) error {
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("Couldn't write to file: %s", err)
</s> add log.Error("Couldn't write to file: %s", err) </s> remove log.Printf("failed to create file \"%s\": %s", filename, err)
</s> add log.Error("failed to create file \"%s\": %s", filename, err) </s> remove log.Printf("Couldn't write config: %s", err)
</s> add log.Error("Couldn't write config: %s", err) </s> remove log.Printf("Couldn't close gzip writer: %s", err)
</s> add log.Error("Couldn't close gzip writer: %s", err) </s> remove log.Printf("Reading config file: %s", configFile)
</s> add log.Debug("Reading config file: %s", configFile) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | dnsforward/querylog_file.go |
log.Error("Failed to decode: %s", err) | <mask> for d.More() {
<mask> entry := &logEntry{}
<mask> err := d.Decode(entry)
<mask> if err != nil {
<mask> log.Printf("Failed to decode: %s", err)
<mask> return err
<mask> }
<mask> if diff := deep.Equal(entry, buffer[i]); diff != nil {
<mask> log.Printf("decoded buffer differs: %s", diff)
<mask> return fmt.Errorf("decoded buffer differs: %s", diff)
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("decoded buffer differs: %s", diff)
</s> add log.Error("decoded buffer differs: %s", diff) </s> remove log.Printf("Failed to marshal entry: %s", err)
</s> add log.Error("Failed to marshal entry: %s", err) </s> remove log.Printf("Failed to decode: %s", err)
</s> add log.Error("Failed to decode: %s", err) </s> remove log.Printf("Failed to rotate querylog: %s", err)
</s> add log.Error("Failed to rotate querylog: %s", err) </s> remove log.Printf("Failed to create gzip reader: %s", err)
</s> add log.Error("Failed to create gzip reader: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | dnsforward/querylog_file.go |
log.Error("decoded buffer differs: %s", diff) | <mask> log.Printf("Failed to decode: %s", err)
<mask> return err
<mask> }
<mask> if diff := deep.Equal(entry, buffer[i]); diff != nil {
<mask> log.Printf("decoded buffer differs: %s", diff)
<mask> return fmt.Errorf("decoded buffer differs: %s", diff)
<mask> }
<mask> i++
<mask> }
<mask> if i != l {
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("Failed to decode: %s", err)
</s> add log.Error("Failed to decode: %s", err) </s> remove log.Printf("Failed to marshal entry: %s", err)
</s> add log.Error("Failed to marshal entry: %s", err) </s> remove log.Printf("Failed to decode: %s", err)
</s> add log.Error("Failed to decode: %s", err) </s> remove log.Print(err)
</s> add log.Error("%v", err) </s> remove log.Printf("Failed to create gzip reader: %s", err)
</s> add log.Error("Failed to create gzip reader: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | dnsforward/querylog_file.go |
log.Error("%v", err) | <mask> i++
<mask> }
<mask> if i != l {
<mask> err := fmt.Errorf("check fail: %d vs %d entries", l, i)
<mask> log.Print(err)
<mask> return err
<mask> }
<mask> log.Printf("check ok: %d entries", i)
<mask>
<mask> return nil
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("check ok: %d entries", i)
</s> add log.Debug("check ok: %d entries", i) </s> remove log.Printf("decoded buffer differs: %s", diff)
</s> add log.Error("decoded buffer differs: %s", diff) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | dnsforward/querylog_file.go |
log.Debug("check ok: %d entries", i) | <mask> err := fmt.Errorf("check fail: %d vs %d entries", l, i)
<mask> log.Print(err)
<mask> return err
<mask> }
<mask> log.Printf("check ok: %d entries", i)
<mask>
<mask> return nil
<mask> }
<mask>
<mask> func (l *queryLog) rotateQueryLog() error {
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Print(err)
</s> add log.Error("%v", err) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Printf("Failed to rotate querylog: %s", err)
</s> add log.Error("Failed to rotate querylog: %s", err) </s> remove log.Println(errorText)
</s> add log.Error(errorText) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | dnsforward/querylog_file.go |
log.Error("Failed to rename querylog: %s", err) | <mask> }
<mask>
<mask> err := os.Rename(from, to)
<mask> if err != nil {
<mask> log.Printf("Failed to rename querylog: %s", err)
<mask> return err
<mask> }
<mask>
<mask> log.Printf("Rotated from %s to %s successfully", from, to)
<mask>
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("Rotated from %s to %s successfully", from, to)
</s> add log.Debug("Rotated from %s to %s successfully", from, to) </s> remove log.Printf("Failed to rotate querylog: %s", err)
</s> add log.Error("Failed to rotate querylog: %s", err) </s> remove log.Printf("Checking if DNS %s works...", input)
</s> add log.Debug("Checking if DNS %s works...", input) </s> remove log.Printf("Failed to marshal entry: %s", err)
</s> add log.Error("Failed to marshal entry: %s", err) </s> remove log.Printf("Failed to decode: %s", err)
</s> add log.Error("Failed to decode: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | dnsforward/querylog_file.go |
log.Debug("Rotated from %s to %s successfully", from, to) | <mask> log.Printf("Failed to rename querylog: %s", err)
<mask> return err
<mask> }
<mask>
<mask> log.Printf("Rotated from %s to %s successfully", from, to)
<mask>
<mask> return nil
<mask> }
<mask>
<mask> func (l *queryLog) periodicQueryLogRotate() {
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("Failed to rename querylog: %s", err)
</s> add log.Error("Failed to rename querylog: %s", err) </s> remove log.Printf("Failed to rotate querylog: %s", err)
</s> add log.Error("Failed to rotate querylog: %s", err) </s> remove log.Printf("Checking if DNS %s works...", input)
</s> add log.Debug("Checking if DNS %s works...", input) </s> remove log.Printf("DNS %s works OK", input)
</s> add log.Debug("DNS %s works OK", input) </s> remove log.Printf("check ok: %d entries", i)
</s> add log.Debug("check ok: %d entries", i) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | dnsforward/querylog_file.go |
log.Error("Failed to rotate querylog: %s", err) | <mask> func (l *queryLog) periodicQueryLogRotate() {
<mask> for range time.Tick(queryLogRotationPeriod) {
<mask> err := l.rotateQueryLog()
<mask> if err != nil {
<mask> log.Printf("Failed to rotate querylog: %s", err)
<mask> // do nothing, continue rotating
<mask> }
<mask> }
<mask> }
<mask>
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("Rotated from %s to %s successfully", from, to)
</s> add log.Debug("Rotated from %s to %s successfully", from, to) </s> remove log.Printf("Failed to marshal entry: %s", err)
</s> add log.Error("Failed to marshal entry: %s", err) </s> remove log.Printf("Failed to rename querylog: %s", err)
</s> add log.Error("Failed to rename querylog: %s", err) </s> remove log.Printf("Failed to create gzip reader: %s", err)
</s> add log.Error("Failed to create gzip reader: %s", err) </s> remove log.Printf("Failed to decode: %s", err)
</s> add log.Error("Failed to decode: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | dnsforward/querylog_file.go |
log.Error("Failed to open file \"%s\": %s", file, err) | <mask> }
<mask>
<mask> f, err := os.Open(file)
<mask> if err != nil {
<mask> log.Printf("Failed to open file \"%s\": %s", file, err)
<mask> // try next file
<mask> continue
<mask> }
<mask> defer f.Close()
<mask>
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("failed to create file \"%s\": %s", filename, err)
</s> add log.Error("failed to create file \"%s\": %s", filename, err) </s> remove log.Printf("Failed to decode: %s", err)
</s> add log.Error("Failed to decode: %s", err) </s> remove log.Printf("Couldn't write to file: %s", err)
</s> add log.Error("Couldn't write to file: %s", err) </s> remove log.Printf("Failed to create gzip reader: %s", err)
</s> add log.Error("Failed to create gzip reader: %s", err) </s> remove log.Printf("Saving querylog to file failed: %s", err)
</s> add log.Error("Saving querylog to file failed: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | dnsforward/querylog_file.go |
log.Error("Failed to create gzip reader: %s", err) | <mask>
<mask> if enableGzip {
<mask> zr, err := gzip.NewReader(f)
<mask> if err != nil {
<mask> log.Printf("Failed to create gzip reader: %s", err)
<mask> continue
<mask> }
<mask> defer zr.Close()
<mask> d = json.NewDecoder(zr)
<mask> } else {
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("Couldn't close gzip writer: %s", err)
</s> add log.Error("Couldn't close gzip writer: %s", err) </s> remove log.Printf("Failed to open file \"%s\": %s", file, err)
</s> add log.Error("Failed to open file \"%s\": %s", file, err) </s> remove log.Printf("failed to create file \"%s\": %s", filename, err)
</s> add log.Error("failed to create file \"%s\": %s", filename, err) </s> remove log.Printf("Failed to rotate querylog: %s", err)
</s> add log.Error("Failed to rotate querylog: %s", err) </s> remove log.Printf("Failed to decode: %s", err)
</s> add log.Error("Failed to decode: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | dnsforward/querylog_file.go |
log.Error("Failed to decode: %s", err) | <mask> }
<mask> var entry logEntry
<mask> err := d.Decode(&entry)
<mask> if err != nil {
<mask> log.Printf("Failed to decode: %s", err)
<mask> // next entry can be fine, try more
<mask> continue
<mask> }
<mask>
<mask> if now.Sub(entry.Time) > timeWindow {
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("Failed to decode: %s", err)
</s> add log.Error("Failed to decode: %s", err) </s> remove log.Printf("Failed to open file \"%s\": %s", file, err)
</s> add log.Error("Failed to open file \"%s\": %s", file, err) </s> remove log.Printf("Failed to marshal entry: %s", err)
</s> add log.Error("Failed to marshal entry: %s", err) </s> remove log.Printf("Failed to rotate querylog: %s", err)
</s> add log.Error("Failed to rotate querylog: %s", err) </s> remove log.Printf("Failed to create gzip reader: %s", err)
</s> add log.Error("Failed to create gzip reader: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | dnsforward/querylog_file.go |
log.Debug("file \"%s\": read %d entries in %v, %v/entry, %v over %v, %v avg", file, i, elapsed, perunit, over, max, avg) | <mask> if i > 0 {
<mask> perunit = elapsed / time.Duration(i)
<mask> avg = sum / time.Duration(i)
<mask> }
<mask> log.Printf("file \"%s\": read %d entries in %v, %v/entry, %v over %v, %v avg", file, i, elapsed, perunit, over, max, avg)
<mask> }
<mask> return nil
<mask> }
</s> * use new logger - AdguardTeam/golibs/log </s> remove log.Printf("%d elements serialized via json in %v: %d kB, %v/entry, %v/entry", len(buffer), elapsed, b.Len()/1024, float64(b.Len())/float64(len(buffer)), elapsed/time.Duration(len(buffer)))
</s> add log.Debug("%d elements serialized via json in %v: %d kB, %v/entry, %v/entry", len(buffer), elapsed, b.Len()/1024, float64(b.Len())/float64(len(buffer)), elapsed/time.Duration(len(buffer))) </s> remove log.Printf("ok \"%s\": %v bytes written", filename, n)
</s> add log.Debug("ok \"%s\": %v bytes written", filename, n) </s> remove log.Printf("Failed to open file \"%s\": %s", file, err)
</s> add log.Error("Failed to open file \"%s\": %s", file, err) </s> remove log.Printf("Couldn't write to file: %s", err)
</s> add log.Error("Couldn't write to file: %s", err) </s> remove log.Printf("failed to check buffer: %s", err)
</s> add log.Error("failed to check buffer: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | dnsforward/querylog_file.go |
"github.com/AdguardTeam/golibs/log" | <mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/bluele/gcache"
<mask> "github.com/hmage/golibs/log"
<mask> "github.com/miekg/dns"
<mask> )
<mask>
<mask> type hourTop struct {
<mask> domains gcache.Cache
</s> * use new logger - AdguardTeam/golibs/log </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add </s> remove "github.com/hmage/golibs/log"
</s> add </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | dnsforward/querylog_top.go |
"github.com/AdguardTeam/golibs/log" | <mask> "strings"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/dnsfilter"
<mask> "github.com/hmage/golibs/log"
<mask> )
<mask>
<mask> var (
<mask> nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID
<mask> filterTitleRegexp = regexp.MustCompile(`^! Title: +(.*)$`)
</s> * use new logger - AdguardTeam/golibs/log </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | filter.go |
github.com/AdguardTeam/golibs v0.1 | <mask> require (
<mask> github.com/AdguardTeam/dnsproxy v0.11.1
<mask> github.com/StackExchange/wmi v0.0.0-20180725035823-b12b22c5341f // indirect
<mask> github.com/bluele/gcache v0.0.0-20171010155617-472614239ac7
<mask> github.com/go-ole/go-ole v1.2.1 // indirect
<mask> github.com/go-test/deep v1.0.1
</s> * use new logger - AdguardTeam/golibs/log </s> remove github.com/hmage/golibs v0.0.0-20190121112702-20153bd03c24
</s> add </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | go.mod |
<mask> github.com/bluele/gcache v0.0.0-20171010155617-472614239ac7
<mask> github.com/go-ole/go-ole v1.2.1 // indirect
<mask> github.com/go-test/deep v1.0.1
<mask> github.com/gobuffalo/packr v1.19.0
<mask> github.com/hmage/golibs v0.0.0-20190121112702-20153bd03c24
<mask> github.com/joomcode/errorx v0.1.0
<mask> github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 // indirect
<mask> github.com/kardianos/service v0.0.0-20181115005516-4c239ee84e7b
<mask> github.com/krolaw/dhcp4 v0.0.0-20180925202202-7cead472c414
<mask> github.com/miekg/dns v1.1.1
</s> * use new logger - AdguardTeam/golibs/log </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove log.Println(text)
</s> add log.Info(text) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | go.mod |
|
"github.com/AdguardTeam/golibs/log" | <mask>
<mask> import (
<mask> "testing"
<mask>
<mask> "github.com/hmage/golibs/log"
<mask> )
<mask>
<mask> func TestGetValidNetInterfacesForWeb(t *testing.T) {
<mask> ifaces, err := getValidNetInterfacesForWeb()
<mask> if err != nil {
</s> * use new logger - AdguardTeam/golibs/log </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) </s> remove log.Println(errorText)
</s> add log.Error(errorText) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | helpers_test.go |
"github.com/AdguardTeam/golibs/log" | <mask> "io/ioutil"
<mask> "net/http"
<mask> "strings"
<mask>
<mask> "github.com/hmage/golibs/log"
<mask> )
<mask>
<mask> // --------------------
<mask> // internationalization
<mask> // --------------------
</s> * use new logger - AdguardTeam/golibs/log </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | i18n.go |
"github.com/AdguardTeam/golibs/log" | <mask> import (
<mask> "os"
<mask> "runtime"
<mask>
<mask> "github.com/hmage/golibs/log"
<mask> "github.com/kardianos/service"
<mask> )
<mask>
<mask> const (
<mask> launchdStdoutPath = "/var/log/AdGuardHome.stdout.log"
</s> * use new logger - AdguardTeam/golibs/log </s> remove stdlog "log"
</s> add </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | service.go |
"github.com/AdguardTeam/golibs/log" | <mask> "io/ioutil"
<mask> "os"
<mask> "path/filepath"
<mask>
<mask> "github.com/hmage/golibs/log"
<mask> yaml "gopkg.in/yaml.v2"
<mask> )
<mask>
<mask> const currentSchemaVersion = 2 // used for upgrading from old configs to new config
<mask>
</s> * use new logger - AdguardTeam/golibs/log </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove "github.com/hmage/golibs/log"
</s> add "github.com/AdguardTeam/golibs/log" </s> remove stdlog "log"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cb6d97cd7b80047cfff2628cb56f1d54735e3d0 | upgrade.go |
tcpPort(config.BindPort),
tcpPort(config.BetaBindPort),
udpPort(config.DNS.Port), | <mask>
<mask> uc := aghalg.UniqChecker{}
<mask> addPorts(
<mask> uc,
<mask> config.BindPort,
<mask> config.BetaBindPort,
<mask> config.DNS.Port,
<mask> )
<mask>
<mask> if config.TLS.Enabled {
<mask> addPorts(
<mask> uc,
</s> Pull request: 4276 upd quic port
Merge in DNS/adguard-home from 4276-doq-port to master
Closes #4276.
Squashed commit of the following:
commit cbdde622b54d0d5d11d1b4809f95a41ace990a1b
Merge: d32c13e9 2c33ab6a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 15:47:43 2022 +0300
Merge branch 'master' into 4276-doq-port
commit d32c13e98f0fed2c863160e4e2de02ae3038e3df
Author: Eugene Burkov <[email protected]>
Date: Mon Mar 21 21:55:09 2022 +0300
all: fix link
commit 0afd702f5192d727927df2f8d95b9317811a1be0
Author: Eugene Burkov <[email protected]>
Date: Mon Mar 21 21:47:38 2022 +0300
all: imp docs, log changes
commit 9a77fc3daf78d32c577f1bc49aa1f8bc352d44e3
Author: Eugene Burkov <[email protected]>
Date: Mon Mar 21 21:41:30 2022 +0300
home: upd quic port </s> remove args.bindPort,
config.BetaBindPort,
config.DNS.Port,
</s> add tcpPort(args.bindPort),
tcpPort(config.BetaBindPort),
udpPort(config.DNS.Port), </s> remove config.BindPort,
config.BetaBindPort,
config.DNS.Port,
data.PortHTTPS,
data.PortDNSOverTLS,
data.PortDNSOverQUIC,
data.PortDNSCrypt,
</s> add tcpPort(config.BindPort),
tcpPort(config.BetaBindPort),
udpPort(config.DNS.Port),
tcpPort(data.PortHTTPS),
tcpPort(data.PortDNSOverTLS),
udpPort(data.PortDNSOverQUIC),
tcpPort(data.PortDNSCrypt), </s> remove config.BindPort,
config.BetaBindPort,
config.DNS.Port,
setts.PortHTTPS,
setts.PortDNSOverTLS,
setts.PortDNSOverQUIC,
setts.PortDNSCrypt,
</s> add tcpPort(config.BindPort),
tcpPort(config.BetaBindPort),
udpPort(config.DNS.Port),
tcpPort(setts.PortHTTPS),
tcpPort(setts.PortDNSOverTLS),
udpPort(setts.PortDNSOverQUIC),
tcpPort(setts.PortDNSCrypt), </s> remove config.TLS.PortHTTPS,
config.TLS.PortDNSOverTLS,
config.TLS.PortDNSOverQUIC,
config.TLS.PortDNSCrypt,
</s> add tcpPort(config.TLS.PortHTTPS),
tcpPort(config.TLS.PortDNSOverTLS),
udpPort(config.TLS.PortDNSOverQUIC),
tcpPort(config.TLS.PortDNSCrypt), </s> remove config.TLS.PortHTTPS,
config.TLS.PortDNSOverTLS,
config.TLS.PortDNSOverQUIC,
config.TLS.PortDNSCrypt,
</s> add // TODO(e.burkov): Consider adding a udpPort with the same value if
// we ever support the HTTP/3 for web admin interface.
tcpPort(config.TLS.PortHTTPS),
tcpPort(config.TLS.PortDNSOverTLS),
udpPort(config.TLS.PortDNSOverQUIC),
tcpPort(config.TLS.PortDNSCrypt), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cba78a8d5ca35e33c35ff68ef0b668d78826c7f | internal/home/config.go |
// TODO(e.burkov): Consider adding a udpPort with the same value if
// we ever support the HTTP/3 for web admin interface.
tcpPort(config.TLS.PortHTTPS),
tcpPort(config.TLS.PortDNSOverTLS),
udpPort(config.TLS.PortDNSOverQUIC),
tcpPort(config.TLS.PortDNSCrypt), | <mask>
<mask> if config.TLS.Enabled {
<mask> addPorts(
<mask> uc,
<mask> config.TLS.PortHTTPS,
<mask> config.TLS.PortDNSOverTLS,
<mask> config.TLS.PortDNSOverQUIC,
<mask> config.TLS.PortDNSCrypt,
<mask> )
<mask> }
<mask> if err = uc.Validate(aghalg.IntIsBefore); err != nil {
<mask> return fmt.Errorf("validating ports: %w", err)
<mask> }
</s> Pull request: 4276 upd quic port
Merge in DNS/adguard-home from 4276-doq-port to master
Closes #4276.
Squashed commit of the following:
commit cbdde622b54d0d5d11d1b4809f95a41ace990a1b
Merge: d32c13e9 2c33ab6a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 15:47:43 2022 +0300
Merge branch 'master' into 4276-doq-port
commit d32c13e98f0fed2c863160e4e2de02ae3038e3df
Author: Eugene Burkov <[email protected]>
Date: Mon Mar 21 21:55:09 2022 +0300
all: fix link
commit 0afd702f5192d727927df2f8d95b9317811a1be0
Author: Eugene Burkov <[email protected]>
Date: Mon Mar 21 21:47:38 2022 +0300
all: imp docs, log changes
commit 9a77fc3daf78d32c577f1bc49aa1f8bc352d44e3
Author: Eugene Burkov <[email protected]>
Date: Mon Mar 21 21:41:30 2022 +0300
home: upd quic port </s> remove config.TLS.PortHTTPS,
config.TLS.PortDNSOverTLS,
config.TLS.PortDNSOverQUIC,
config.TLS.PortDNSCrypt,
</s> add tcpPort(config.TLS.PortHTTPS),
tcpPort(config.TLS.PortDNSOverTLS),
udpPort(config.TLS.PortDNSOverQUIC),
tcpPort(config.TLS.PortDNSCrypt), </s> remove args.bindPort,
config.BetaBindPort,
config.DNS.Port,
</s> add tcpPort(args.bindPort),
tcpPort(config.BetaBindPort),
udpPort(config.DNS.Port), </s> remove config.BindPort,
config.BetaBindPort,
config.DNS.Port,
setts.PortHTTPS,
setts.PortDNSOverTLS,
setts.PortDNSOverQUIC,
setts.PortDNSCrypt,
</s> add tcpPort(config.BindPort),
tcpPort(config.BetaBindPort),
udpPort(config.DNS.Port),
tcpPort(setts.PortHTTPS),
tcpPort(setts.PortDNSOverTLS),
udpPort(setts.PortDNSOverQUIC),
tcpPort(setts.PortDNSCrypt), </s> remove config.BindPort,
config.BetaBindPort,
config.DNS.Port,
data.PortHTTPS,
data.PortDNSOverTLS,
data.PortDNSOverQUIC,
data.PortDNSCrypt,
</s> add tcpPort(config.BindPort),
tcpPort(config.BetaBindPort),
udpPort(config.DNS.Port),
tcpPort(data.PortHTTPS),
tcpPort(data.PortDNSOverTLS),
udpPort(data.PortDNSOverQUIC),
tcpPort(data.PortDNSCrypt), </s> remove addPorts(uc, port)
</s> add addPorts(uc, udpPort(port)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cba78a8d5ca35e33c35ff68ef0b668d78826c7f | internal/home/config.go |
// udpPort is the port number for UDP protocol.
type udpPort int
// tcpPort is the port number for TCP protocol.
type tcpPort int
// addPorts is a helper for ports validation. It skips zero ports. Each of
// ports should be either a udpPort or a tcpPort.
func addPorts(uc aghalg.UniqChecker, ports ...interface{}) { | <mask>
<mask> return nil
<mask> }
<mask>
<mask> // addPorts is a helper for ports validation. It skips zero ports.
<mask> func addPorts(uc aghalg.UniqChecker, ports ...int) {
<mask> for _, p := range ports {
<mask> if p != 0 {
<mask> uc.Add(p)
<mask> }
<mask> }
</s> Pull request: 4276 upd quic port
Merge in DNS/adguard-home from 4276-doq-port to master
Closes #4276.
Squashed commit of the following:
commit cbdde622b54d0d5d11d1b4809f95a41ace990a1b
Merge: d32c13e9 2c33ab6a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 15:47:43 2022 +0300
Merge branch 'master' into 4276-doq-port
commit d32c13e98f0fed2c863160e4e2de02ae3038e3df
Author: Eugene Burkov <[email protected]>
Date: Mon Mar 21 21:55:09 2022 +0300
all: fix link
commit 0afd702f5192d727927df2f8d95b9317811a1be0
Author: Eugene Burkov <[email protected]>
Date: Mon Mar 21 21:47:38 2022 +0300
all: imp docs, log changes
commit 9a77fc3daf78d32c577f1bc49aa1f8bc352d44e3
Author: Eugene Burkov <[email protected]>
Date: Mon Mar 21 21:41:30 2022 +0300
home: upd quic port </s> remove if p != 0 {
uc.Add(p)
</s> add switch p := p.(type) {
case tcpPort, udpPort:
if p != 0 {
uc.Add(p)
}
default:
// Go on. </s> remove config.TLS.PortHTTPS,
config.TLS.PortDNSOverTLS,
config.TLS.PortDNSOverQUIC,
config.TLS.PortDNSCrypt,
</s> add // TODO(e.burkov): Consider adding a udpPort with the same value if
// we ever support the HTTP/3 for web admin interface.
tcpPort(config.TLS.PortHTTPS),
tcpPort(config.TLS.PortDNSOverTLS),
udpPort(config.TLS.PortDNSOverQUIC),
tcpPort(config.TLS.PortDNSCrypt), </s> remove args.bindPort,
config.BetaBindPort,
config.DNS.Port,
</s> add tcpPort(args.bindPort),
tcpPort(config.BetaBindPort),
udpPort(config.DNS.Port), </s> remove addPorts(uc, port)
</s> add addPorts(uc, udpPort(port)) </s> remove config.TLS.PortHTTPS,
config.TLS.PortDNSOverTLS,
config.TLS.PortDNSOverQUIC,
config.TLS.PortDNSCrypt,
</s> add tcpPort(config.TLS.PortHTTPS),
tcpPort(config.TLS.PortDNSOverTLS),
udpPort(config.TLS.PortDNSOverQUIC),
tcpPort(config.TLS.PortDNSCrypt), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cba78a8d5ca35e33c35ff68ef0b668d78826c7f | internal/home/config.go |
switch p := p.(type) {
case tcpPort, udpPort:
if p != 0 {
uc.Add(p)
}
default:
// Go on. | <mask>
<mask> // addPorts is a helper for ports validation. It skips zero ports.
<mask> func addPorts(uc aghalg.UniqChecker, ports ...int) {
<mask> for _, p := range ports {
<mask> if p != 0 {
<mask> uc.Add(p)
<mask> }
<mask> }
<mask> }
<mask>
<mask> // readConfigFile reads configuration file contents.
</s> Pull request: 4276 upd quic port
Merge in DNS/adguard-home from 4276-doq-port to master
Closes #4276.
Squashed commit of the following:
commit cbdde622b54d0d5d11d1b4809f95a41ace990a1b
Merge: d32c13e9 2c33ab6a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 15:47:43 2022 +0300
Merge branch 'master' into 4276-doq-port
commit d32c13e98f0fed2c863160e4e2de02ae3038e3df
Author: Eugene Burkov <[email protected]>
Date: Mon Mar 21 21:55:09 2022 +0300
all: fix link
commit 0afd702f5192d727927df2f8d95b9317811a1be0
Author: Eugene Burkov <[email protected]>
Date: Mon Mar 21 21:47:38 2022 +0300
all: imp docs, log changes
commit 9a77fc3daf78d32c577f1bc49aa1f8bc352d44e3
Author: Eugene Burkov <[email protected]>
Date: Mon Mar 21 21:41:30 2022 +0300
home: upd quic port </s> remove // addPorts is a helper for ports validation. It skips zero ports.
func addPorts(uc aghalg.UniqChecker, ports ...int) {
</s> add // udpPort is the port number for UDP protocol.
type udpPort int
// tcpPort is the port number for TCP protocol.
type tcpPort int
// addPorts is a helper for ports validation. It skips zero ports. Each of
// ports should be either a udpPort or a tcpPort.
func addPorts(uc aghalg.UniqChecker, ports ...interface{}) { </s> remove config.TLS.PortHTTPS,
config.TLS.PortDNSOverTLS,
config.TLS.PortDNSOverQUIC,
config.TLS.PortDNSCrypt,
</s> add // TODO(e.burkov): Consider adding a udpPort with the same value if
// we ever support the HTTP/3 for web admin interface.
tcpPort(config.TLS.PortHTTPS),
tcpPort(config.TLS.PortDNSOverTLS),
udpPort(config.TLS.PortDNSOverQUIC),
tcpPort(config.TLS.PortDNSCrypt), </s> remove args.bindPort,
config.BetaBindPort,
config.DNS.Port,
</s> add tcpPort(args.bindPort),
tcpPort(config.BetaBindPort),
udpPort(config.DNS.Port), </s> remove defaultPortQUIC = 784
</s> add defaultPortQUIC = 853 </s> remove addPorts(uc, port)
</s> add addPorts(uc, udpPort(port)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cba78a8d5ca35e33c35ff68ef0b668d78826c7f | internal/home/config.go |
addPorts(uc, tcpPort(config.BetaBindPort), tcpPort(port)) | <mask> func (req *checkConfReq) validateWeb(uc aghalg.UniqChecker) (err error) {
<mask> defer func() { err = errors.Annotate(err, "validating ports: %w") }()
<mask>
<mask> port := req.Web.Port
<mask> addPorts(uc, config.BetaBindPort, port)
<mask> if err = uc.Validate(aghalg.IntIsBefore); err != nil {
<mask> // Avoid duplicating the error into the status of DNS.
<mask> uc[port] = 1
<mask>
<mask> return err
</s> Pull request: 4276 upd quic port
Merge in DNS/adguard-home from 4276-doq-port to master
Closes #4276.
Squashed commit of the following:
commit cbdde622b54d0d5d11d1b4809f95a41ace990a1b
Merge: d32c13e9 2c33ab6a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 15:47:43 2022 +0300
Merge branch 'master' into 4276-doq-port
commit d32c13e98f0fed2c863160e4e2de02ae3038e3df
Author: Eugene Burkov <[email protected]>
Date: Mon Mar 21 21:55:09 2022 +0300
all: fix link
commit 0afd702f5192d727927df2f8d95b9317811a1be0
Author: Eugene Burkov <[email protected]>
Date: Mon Mar 21 21:47:38 2022 +0300
all: imp docs, log changes
commit 9a77fc3daf78d32c577f1bc49aa1f8bc352d44e3
Author: Eugene Burkov <[email protected]>
Date: Mon Mar 21 21:41:30 2022 +0300
home: upd quic port </s> remove addPorts(uc, port)
</s> add addPorts(uc, udpPort(port)) </s> remove config.TLS.PortHTTPS,
config.TLS.PortDNSOverTLS,
config.TLS.PortDNSOverQUIC,
config.TLS.PortDNSCrypt,
</s> add // TODO(e.burkov): Consider adding a udpPort with the same value if
// we ever support the HTTP/3 for web admin interface.
tcpPort(config.TLS.PortHTTPS),
tcpPort(config.TLS.PortDNSOverTLS),
udpPort(config.TLS.PortDNSOverQUIC),
tcpPort(config.TLS.PortDNSCrypt), </s> remove config.BindPort,
config.BetaBindPort,
config.DNS.Port,
setts.PortHTTPS,
setts.PortDNSOverTLS,
setts.PortDNSOverQUIC,
setts.PortDNSCrypt,
</s> add tcpPort(config.BindPort),
tcpPort(config.BetaBindPort),
udpPort(config.DNS.Port),
tcpPort(setts.PortHTTPS),
tcpPort(setts.PortDNSOverTLS),
udpPort(setts.PortDNSOverQUIC),
tcpPort(setts.PortDNSCrypt), </s> remove config.TLS.PortHTTPS,
config.TLS.PortDNSOverTLS,
config.TLS.PortDNSOverQUIC,
config.TLS.PortDNSCrypt,
</s> add tcpPort(config.TLS.PortHTTPS),
tcpPort(config.TLS.PortDNSOverTLS),
udpPort(config.TLS.PortDNSOverQUIC),
tcpPort(config.TLS.PortDNSCrypt), </s> remove config.BindPort,
config.BetaBindPort,
config.DNS.Port,
data.PortHTTPS,
data.PortDNSOverTLS,
data.PortDNSOverQUIC,
data.PortDNSCrypt,
</s> add tcpPort(config.BindPort),
tcpPort(config.BetaBindPort),
udpPort(config.DNS.Port),
tcpPort(data.PortHTTPS),
tcpPort(data.PortDNSOverTLS),
udpPort(data.PortDNSOverQUIC),
tcpPort(data.PortDNSCrypt), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cba78a8d5ca35e33c35ff68ef0b668d78826c7f | internal/home/controlinstall.go |
addPorts(uc, udpPort(port)) | <mask> func (req *checkConfReq) validateDNS(uc aghalg.UniqChecker) (canAutofix bool, err error) {
<mask> defer func() { err = errors.Annotate(err, "validating ports: %w") }()
<mask>
<mask> port := req.DNS.Port
<mask> addPorts(uc, port)
<mask> if err = uc.Validate(aghalg.IntIsBefore); err != nil {
<mask> return false, err
<mask> }
<mask>
<mask> switch port {
</s> Pull request: 4276 upd quic port
Merge in DNS/adguard-home from 4276-doq-port to master
Closes #4276.
Squashed commit of the following:
commit cbdde622b54d0d5d11d1b4809f95a41ace990a1b
Merge: d32c13e9 2c33ab6a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 15:47:43 2022 +0300
Merge branch 'master' into 4276-doq-port
commit d32c13e98f0fed2c863160e4e2de02ae3038e3df
Author: Eugene Burkov <[email protected]>
Date: Mon Mar 21 21:55:09 2022 +0300
all: fix link
commit 0afd702f5192d727927df2f8d95b9317811a1be0
Author: Eugene Burkov <[email protected]>
Date: Mon Mar 21 21:47:38 2022 +0300
all: imp docs, log changes
commit 9a77fc3daf78d32c577f1bc49aa1f8bc352d44e3
Author: Eugene Burkov <[email protected]>
Date: Mon Mar 21 21:41:30 2022 +0300
home: upd quic port </s> remove addPorts(uc, config.BetaBindPort, port)
</s> add addPorts(uc, tcpPort(config.BetaBindPort), tcpPort(port)) </s> remove config.TLS.PortHTTPS,
config.TLS.PortDNSOverTLS,
config.TLS.PortDNSOverQUIC,
config.TLS.PortDNSCrypt,
</s> add tcpPort(config.TLS.PortHTTPS),
tcpPort(config.TLS.PortDNSOverTLS),
udpPort(config.TLS.PortDNSOverQUIC),
tcpPort(config.TLS.PortDNSCrypt), </s> remove config.BindPort,
config.BetaBindPort,
config.DNS.Port,
setts.PortHTTPS,
setts.PortDNSOverTLS,
setts.PortDNSOverQUIC,
setts.PortDNSCrypt,
</s> add tcpPort(config.BindPort),
tcpPort(config.BetaBindPort),
udpPort(config.DNS.Port),
tcpPort(setts.PortHTTPS),
tcpPort(setts.PortDNSOverTLS),
udpPort(setts.PortDNSOverQUIC),
tcpPort(setts.PortDNSCrypt), </s> remove config.BindPort,
config.BetaBindPort,
config.DNS.Port,
data.PortHTTPS,
data.PortDNSOverTLS,
data.PortDNSOverQUIC,
data.PortDNSCrypt,
</s> add tcpPort(config.BindPort),
tcpPort(config.BetaBindPort),
udpPort(config.DNS.Port),
tcpPort(data.PortHTTPS),
tcpPort(data.PortDNSOverTLS),
udpPort(data.PortDNSOverQUIC),
tcpPort(data.PortDNSCrypt), </s> remove config.TLS.PortHTTPS,
config.TLS.PortDNSOverTLS,
config.TLS.PortDNSOverQUIC,
config.TLS.PortDNSCrypt,
</s> add // TODO(e.burkov): Consider adding a udpPort with the same value if
// we ever support the HTTP/3 for web admin interface.
tcpPort(config.TLS.PortHTTPS),
tcpPort(config.TLS.PortDNSOverTLS),
udpPort(config.TLS.PortDNSOverQUIC),
tcpPort(config.TLS.PortDNSCrypt), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cba78a8d5ca35e33c35ff68ef0b668d78826c7f | internal/home/controlinstall.go |
defaultPortQUIC = 853 | <mask> const (
<mask> defaultPortDNS = 53
<mask> defaultPortHTTP = 80
<mask> defaultPortHTTPS = 443
<mask> defaultPortQUIC = 784
<mask> defaultPortTLS = 853
<mask> )
<mask>
<mask> // Called by other modules when configuration is changed
<mask> func onConfigModified() {
</s> Pull request: 4276 upd quic port
Merge in DNS/adguard-home from 4276-doq-port to master
Closes #4276.
Squashed commit of the following:
commit cbdde622b54d0d5d11d1b4809f95a41ace990a1b
Merge: d32c13e9 2c33ab6a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 15:47:43 2022 +0300
Merge branch 'master' into 4276-doq-port
commit d32c13e98f0fed2c863160e4e2de02ae3038e3df
Author: Eugene Burkov <[email protected]>
Date: Mon Mar 21 21:55:09 2022 +0300
all: fix link
commit 0afd702f5192d727927df2f8d95b9317811a1be0
Author: Eugene Burkov <[email protected]>
Date: Mon Mar 21 21:47:38 2022 +0300
all: imp docs, log changes
commit 9a77fc3daf78d32c577f1bc49aa1f8bc352d44e3
Author: Eugene Burkov <[email protected]>
Date: Mon Mar 21 21:41:30 2022 +0300
home: upd quic port </s> remove addPorts(uc, config.BetaBindPort, port)
</s> add addPorts(uc, tcpPort(config.BetaBindPort), tcpPort(port)) </s> remove addPorts(uc, port)
</s> add addPorts(uc, udpPort(port)) </s> remove config.TLS.PortHTTPS,
config.TLS.PortDNSOverTLS,
config.TLS.PortDNSOverQUIC,
config.TLS.PortDNSCrypt,
</s> add tcpPort(config.TLS.PortHTTPS),
tcpPort(config.TLS.PortDNSOverTLS),
udpPort(config.TLS.PortDNSOverQUIC),
tcpPort(config.TLS.PortDNSCrypt), </s> remove if p != 0 {
uc.Add(p)
</s> add switch p := p.(type) {
case tcpPort, udpPort:
if p != 0 {
uc.Add(p)
}
default:
// Go on. </s> remove config.BindPort,
config.BetaBindPort,
config.DNS.Port,
data.PortHTTPS,
data.PortDNSOverTLS,
data.PortDNSOverQUIC,
data.PortDNSCrypt,
</s> add tcpPort(config.BindPort),
tcpPort(config.BetaBindPort),
udpPort(config.DNS.Port),
tcpPort(data.PortHTTPS),
tcpPort(data.PortDNSOverTLS),
udpPort(data.PortDNSOverQUIC),
tcpPort(data.PortDNSCrypt), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cba78a8d5ca35e33c35ff68ef0b668d78826c7f | internal/home/dns.go |
tcpPort(args.bindPort),
tcpPort(config.BetaBindPort),
udpPort(config.DNS.Port), | <mask> if args.bindPort != 0 {
<mask> uc := aghalg.UniqChecker{}
<mask> addPorts(
<mask> uc,
<mask> args.bindPort,
<mask> config.BetaBindPort,
<mask> config.DNS.Port,
<mask> )
<mask> if config.TLS.Enabled {
<mask> addPorts(
<mask> uc,
<mask> config.TLS.PortHTTPS,
</s> Pull request: 4276 upd quic port
Merge in DNS/adguard-home from 4276-doq-port to master
Closes #4276.
Squashed commit of the following:
commit cbdde622b54d0d5d11d1b4809f95a41ace990a1b
Merge: d32c13e9 2c33ab6a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 15:47:43 2022 +0300
Merge branch 'master' into 4276-doq-port
commit d32c13e98f0fed2c863160e4e2de02ae3038e3df
Author: Eugene Burkov <[email protected]>
Date: Mon Mar 21 21:55:09 2022 +0300
all: fix link
commit 0afd702f5192d727927df2f8d95b9317811a1be0
Author: Eugene Burkov <[email protected]>
Date: Mon Mar 21 21:47:38 2022 +0300
all: imp docs, log changes
commit 9a77fc3daf78d32c577f1bc49aa1f8bc352d44e3
Author: Eugene Burkov <[email protected]>
Date: Mon Mar 21 21:41:30 2022 +0300
home: upd quic port </s> remove config.BindPort,
config.BetaBindPort,
config.DNS.Port,
</s> add tcpPort(config.BindPort),
tcpPort(config.BetaBindPort),
udpPort(config.DNS.Port), </s> remove config.BindPort,
config.BetaBindPort,
config.DNS.Port,
data.PortHTTPS,
data.PortDNSOverTLS,
data.PortDNSOverQUIC,
data.PortDNSCrypt,
</s> add tcpPort(config.BindPort),
tcpPort(config.BetaBindPort),
udpPort(config.DNS.Port),
tcpPort(data.PortHTTPS),
tcpPort(data.PortDNSOverTLS),
udpPort(data.PortDNSOverQUIC),
tcpPort(data.PortDNSCrypt), </s> remove config.BindPort,
config.BetaBindPort,
config.DNS.Port,
setts.PortHTTPS,
setts.PortDNSOverTLS,
setts.PortDNSOverQUIC,
setts.PortDNSCrypt,
</s> add tcpPort(config.BindPort),
tcpPort(config.BetaBindPort),
udpPort(config.DNS.Port),
tcpPort(setts.PortHTTPS),
tcpPort(setts.PortDNSOverTLS),
udpPort(setts.PortDNSOverQUIC),
tcpPort(setts.PortDNSCrypt), </s> remove config.TLS.PortHTTPS,
config.TLS.PortDNSOverTLS,
config.TLS.PortDNSOverQUIC,
config.TLS.PortDNSCrypt,
</s> add tcpPort(config.TLS.PortHTTPS),
tcpPort(config.TLS.PortDNSOverTLS),
udpPort(config.TLS.PortDNSOverQUIC),
tcpPort(config.TLS.PortDNSCrypt), </s> remove config.TLS.PortHTTPS,
config.TLS.PortDNSOverTLS,
config.TLS.PortDNSOverQUIC,
config.TLS.PortDNSCrypt,
</s> add // TODO(e.burkov): Consider adding a udpPort with the same value if
// we ever support the HTTP/3 for web admin interface.
tcpPort(config.TLS.PortHTTPS),
tcpPort(config.TLS.PortDNSOverTLS),
udpPort(config.TLS.PortDNSOverQUIC),
tcpPort(config.TLS.PortDNSCrypt), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cba78a8d5ca35e33c35ff68ef0b668d78826c7f | internal/home/home.go |
tcpPort(config.TLS.PortHTTPS),
tcpPort(config.TLS.PortDNSOverTLS),
udpPort(config.TLS.PortDNSOverQUIC),
tcpPort(config.TLS.PortDNSCrypt), | <mask> )
<mask> if config.TLS.Enabled {
<mask> addPorts(
<mask> uc,
<mask> config.TLS.PortHTTPS,
<mask> config.TLS.PortDNSOverTLS,
<mask> config.TLS.PortDNSOverQUIC,
<mask> config.TLS.PortDNSCrypt,
<mask> )
<mask> }
<mask> if err = uc.Validate(aghalg.IntIsBefore); err != nil {
<mask> return fmt.Errorf("validating ports: %w", err)
<mask> }
</s> Pull request: 4276 upd quic port
Merge in DNS/adguard-home from 4276-doq-port to master
Closes #4276.
Squashed commit of the following:
commit cbdde622b54d0d5d11d1b4809f95a41ace990a1b
Merge: d32c13e9 2c33ab6a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 15:47:43 2022 +0300
Merge branch 'master' into 4276-doq-port
commit d32c13e98f0fed2c863160e4e2de02ae3038e3df
Author: Eugene Burkov <[email protected]>
Date: Mon Mar 21 21:55:09 2022 +0300
all: fix link
commit 0afd702f5192d727927df2f8d95b9317811a1be0
Author: Eugene Burkov <[email protected]>
Date: Mon Mar 21 21:47:38 2022 +0300
all: imp docs, log changes
commit 9a77fc3daf78d32c577f1bc49aa1f8bc352d44e3
Author: Eugene Burkov <[email protected]>
Date: Mon Mar 21 21:41:30 2022 +0300
home: upd quic port </s> remove config.TLS.PortHTTPS,
config.TLS.PortDNSOverTLS,
config.TLS.PortDNSOverQUIC,
config.TLS.PortDNSCrypt,
</s> add // TODO(e.burkov): Consider adding a udpPort with the same value if
// we ever support the HTTP/3 for web admin interface.
tcpPort(config.TLS.PortHTTPS),
tcpPort(config.TLS.PortDNSOverTLS),
udpPort(config.TLS.PortDNSOverQUIC),
tcpPort(config.TLS.PortDNSCrypt), </s> remove args.bindPort,
config.BetaBindPort,
config.DNS.Port,
</s> add tcpPort(args.bindPort),
tcpPort(config.BetaBindPort),
udpPort(config.DNS.Port), </s> remove config.BindPort,
config.BetaBindPort,
config.DNS.Port,
setts.PortHTTPS,
setts.PortDNSOverTLS,
setts.PortDNSOverQUIC,
setts.PortDNSCrypt,
</s> add tcpPort(config.BindPort),
tcpPort(config.BetaBindPort),
udpPort(config.DNS.Port),
tcpPort(setts.PortHTTPS),
tcpPort(setts.PortDNSOverTLS),
udpPort(setts.PortDNSOverQUIC),
tcpPort(setts.PortDNSCrypt), </s> remove config.BindPort,
config.BetaBindPort,
config.DNS.Port,
data.PortHTTPS,
data.PortDNSOverTLS,
data.PortDNSOverQUIC,
data.PortDNSCrypt,
</s> add tcpPort(config.BindPort),
tcpPort(config.BetaBindPort),
udpPort(config.DNS.Port),
tcpPort(data.PortHTTPS),
tcpPort(data.PortDNSOverTLS),
udpPort(data.PortDNSOverQUIC),
tcpPort(data.PortDNSCrypt), </s> remove addPorts(uc, port)
</s> add addPorts(uc, udpPort(port)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cba78a8d5ca35e33c35ff68ef0b668d78826c7f | internal/home/home.go |
tcpPort(config.BindPort),
tcpPort(config.BetaBindPort),
udpPort(config.DNS.Port),
tcpPort(setts.PortHTTPS),
tcpPort(setts.PortDNSOverTLS),
udpPort(setts.PortDNSOverQUIC),
tcpPort(setts.PortDNSCrypt), | <mask> if setts.Enabled {
<mask> uc := aghalg.UniqChecker{}
<mask> addPorts(
<mask> uc,
<mask> config.BindPort,
<mask> config.BetaBindPort,
<mask> config.DNS.Port,
<mask> setts.PortHTTPS,
<mask> setts.PortDNSOverTLS,
<mask> setts.PortDNSOverQUIC,
<mask> setts.PortDNSCrypt,
<mask> )
<mask>
<mask> err = uc.Validate(aghalg.IntIsBefore)
<mask> if err != nil {
<mask> aghhttp.Error(r, w, http.StatusBadRequest, "validating ports: %s", err)
</s> Pull request: 4276 upd quic port
Merge in DNS/adguard-home from 4276-doq-port to master
Closes #4276.
Squashed commit of the following:
commit cbdde622b54d0d5d11d1b4809f95a41ace990a1b
Merge: d32c13e9 2c33ab6a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 15:47:43 2022 +0300
Merge branch 'master' into 4276-doq-port
commit d32c13e98f0fed2c863160e4e2de02ae3038e3df
Author: Eugene Burkov <[email protected]>
Date: Mon Mar 21 21:55:09 2022 +0300
all: fix link
commit 0afd702f5192d727927df2f8d95b9317811a1be0
Author: Eugene Burkov <[email protected]>
Date: Mon Mar 21 21:47:38 2022 +0300
all: imp docs, log changes
commit 9a77fc3daf78d32c577f1bc49aa1f8bc352d44e3
Author: Eugene Burkov <[email protected]>
Date: Mon Mar 21 21:41:30 2022 +0300
home: upd quic port </s> remove config.BindPort,
config.BetaBindPort,
config.DNS.Port,
data.PortHTTPS,
data.PortDNSOverTLS,
data.PortDNSOverQUIC,
data.PortDNSCrypt,
</s> add tcpPort(config.BindPort),
tcpPort(config.BetaBindPort),
udpPort(config.DNS.Port),
tcpPort(data.PortHTTPS),
tcpPort(data.PortDNSOverTLS),
udpPort(data.PortDNSOverQUIC),
tcpPort(data.PortDNSCrypt), </s> remove config.BindPort,
config.BetaBindPort,
config.DNS.Port,
</s> add tcpPort(config.BindPort),
tcpPort(config.BetaBindPort),
udpPort(config.DNS.Port), </s> remove args.bindPort,
config.BetaBindPort,
config.DNS.Port,
</s> add tcpPort(args.bindPort),
tcpPort(config.BetaBindPort),
udpPort(config.DNS.Port), </s> remove config.TLS.PortHTTPS,
config.TLS.PortDNSOverTLS,
config.TLS.PortDNSOverQUIC,
config.TLS.PortDNSCrypt,
</s> add tcpPort(config.TLS.PortHTTPS),
tcpPort(config.TLS.PortDNSOverTLS),
udpPort(config.TLS.PortDNSOverQUIC),
tcpPort(config.TLS.PortDNSCrypt), </s> remove addPorts(uc, port)
</s> add addPorts(uc, udpPort(port)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cba78a8d5ca35e33c35ff68ef0b668d78826c7f | internal/home/tls.go |
tcpPort(config.BindPort),
tcpPort(config.BetaBindPort),
udpPort(config.DNS.Port),
tcpPort(data.PortHTTPS),
tcpPort(data.PortDNSOverTLS),
udpPort(data.PortDNSOverQUIC),
tcpPort(data.PortDNSCrypt), | <mask> if data.Enabled {
<mask> uc := aghalg.UniqChecker{}
<mask> addPorts(
<mask> uc,
<mask> config.BindPort,
<mask> config.BetaBindPort,
<mask> config.DNS.Port,
<mask> data.PortHTTPS,
<mask> data.PortDNSOverTLS,
<mask> data.PortDNSOverQUIC,
<mask> data.PortDNSCrypt,
<mask> )
<mask>
<mask> err = uc.Validate(aghalg.IntIsBefore)
<mask> if err != nil {
<mask> aghhttp.Error(r, w, http.StatusBadRequest, "%s", err)
</s> Pull request: 4276 upd quic port
Merge in DNS/adguard-home from 4276-doq-port to master
Closes #4276.
Squashed commit of the following:
commit cbdde622b54d0d5d11d1b4809f95a41ace990a1b
Merge: d32c13e9 2c33ab6a
Author: Eugene Burkov <[email protected]>
Date: Wed Mar 23 15:47:43 2022 +0300
Merge branch 'master' into 4276-doq-port
commit d32c13e98f0fed2c863160e4e2de02ae3038e3df
Author: Eugene Burkov <[email protected]>
Date: Mon Mar 21 21:55:09 2022 +0300
all: fix link
commit 0afd702f5192d727927df2f8d95b9317811a1be0
Author: Eugene Burkov <[email protected]>
Date: Mon Mar 21 21:47:38 2022 +0300
all: imp docs, log changes
commit 9a77fc3daf78d32c577f1bc49aa1f8bc352d44e3
Author: Eugene Burkov <[email protected]>
Date: Mon Mar 21 21:41:30 2022 +0300
home: upd quic port </s> remove config.BindPort,
config.BetaBindPort,
config.DNS.Port,
setts.PortHTTPS,
setts.PortDNSOverTLS,
setts.PortDNSOverQUIC,
setts.PortDNSCrypt,
</s> add tcpPort(config.BindPort),
tcpPort(config.BetaBindPort),
udpPort(config.DNS.Port),
tcpPort(setts.PortHTTPS),
tcpPort(setts.PortDNSOverTLS),
udpPort(setts.PortDNSOverQUIC),
tcpPort(setts.PortDNSCrypt), </s> remove config.BindPort,
config.BetaBindPort,
config.DNS.Port,
</s> add tcpPort(config.BindPort),
tcpPort(config.BetaBindPort),
udpPort(config.DNS.Port), </s> remove args.bindPort,
config.BetaBindPort,
config.DNS.Port,
</s> add tcpPort(args.bindPort),
tcpPort(config.BetaBindPort),
udpPort(config.DNS.Port), </s> remove config.TLS.PortHTTPS,
config.TLS.PortDNSOverTLS,
config.TLS.PortDNSOverQUIC,
config.TLS.PortDNSCrypt,
</s> add tcpPort(config.TLS.PortHTTPS),
tcpPort(config.TLS.PortDNSOverTLS),
udpPort(config.TLS.PortDNSOverQUIC),
tcpPort(config.TLS.PortDNSCrypt), </s> remove config.TLS.PortHTTPS,
config.TLS.PortDNSOverTLS,
config.TLS.PortDNSOverQUIC,
config.TLS.PortDNSCrypt,
</s> add // TODO(e.burkov): Consider adding a udpPort with the same value if
// we ever support the HTTP/3 for web admin interface.
tcpPort(config.TLS.PortHTTPS),
tcpPort(config.TLS.PortDNSOverTLS),
udpPort(config.TLS.PortDNSOverQUIC),
tcpPort(config.TLS.PortDNSCrypt), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cba78a8d5ca35e33c35ff68ef0b668d78826c7f | internal/home/tls.go |
func handleTLSValidate(w http.ResponseWriter, r *http.Request) {
data, err := unmarshalTLS(r)
if err != nil {
httpError(w, http.StatusBadRequest, "Failed to unmarshal TLS config: %s", err)
return
}
data, err = validateCertificates(data)
if err != nil {
httpError(w, http.StatusBadRequest, "New TLS configuration does not validate: %s", err)
return
}
}
| <mask> }
<mask>
<mask> func handleTLSConfigure(w http.ResponseWriter, r *http.Request) {
<mask> data, err := unmarshalTLS(r)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "Failed to unmarshal TLS config: %s", err)
</s> Introduce /tls/validate and validateCertificates() that will also be used by /tls/configure </s> remove httpError(w, http.StatusBadRequest, "failed to parse certificate: %s", err)
return
</s> add return data, errorx.Decorate(err, "Failed to parse certificate") </s> remove httpError(w, http.StatusBadRequest, "Your certificate does not verify: %s", err)
return
</s> add return data, errorx.Decorate(err, "Your certificate does not verify") </s> remove httpError(w, http.StatusBadRequest, "Invalid certificate or key: %s", err)
return
</s> add return data, errorx.Decorate(err, "Invalid certificate or key") </s> remove config.TLS = data
httpUpdateConfigReloadDNSReturnOK(w, r)
</s> add return data, nil | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cbaeb82a8b3cabdba1d5d4decc67c3fe0dc7d6f | control.go |
data, err = validateCertificates(data)
if err != nil {
httpError(w, http.StatusBadRequest, "New TLS configuration does not validate: %s", err)
return
}
config.TLS = data
httpUpdateConfigReloadDNSReturnOK(w, r)
}
func validateCertificates(data tlsConfig) (tlsConfig, error) {
var err error
| <mask> return
<mask> }
<mask>
<mask> if data.CertificateChain != "" {
<mask> log.Printf("got certificate: %s", data.CertificateChain)
<mask>
<mask> if data.PrivateKey != "" {
<mask> _, err = tls.X509KeyPair([]byte(data.CertificateChain), []byte(data.PrivateKey))
</s> Introduce /tls/validate and validateCertificates() that will also be used by /tls/configure </s> remove httpError(w, http.StatusBadRequest, "Invalid certificate or key: %s", err)
return
</s> add return data, errorx.Decorate(err, "Invalid certificate or key") </s> remove httpError(w, http.StatusBadRequest, "failed to parse certificate: %s", err)
return
</s> add return data, errorx.Decorate(err, "Failed to parse certificate") </s> remove httpError(w, http.StatusBadRequest, "Your certificate does not verify: %s", err)
return
</s> add return data, errorx.Decorate(err, "Your certificate does not verify") </s> remove _, err = mainCert.Verify(opts)
</s> add _, err := mainCert.Verify(opts) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cbaeb82a8b3cabdba1d5d4decc67c3fe0dc7d6f | control.go |
return data, errorx.Decorate(err, "Invalid certificate or key") | <mask>
<mask> if data.PrivateKey != "" {
<mask> _, err = tls.X509KeyPair([]byte(data.CertificateChain), []byte(data.PrivateKey))
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "Invalid certificate or key: %s", err)
<mask> return
<mask> }
<mask> }
<mask>
<mask> // now do a more extended validation
<mask> var certs []*pem.Block // PEM-encoded certificates
</s> Introduce /tls/validate and validateCertificates() that will also be used by /tls/configure </s> remove _, err = mainCert.Verify(opts)
</s> add _, err := mainCert.Verify(opts) </s> remove httpError(w, http.StatusBadRequest, "Your certificate does not verify: %s", err)
return
</s> add return data, errorx.Decorate(err, "Your certificate does not verify") </s> remove httpError(w, http.StatusBadRequest, "failed to parse certificate: %s", err)
return
</s> add return data, errorx.Decorate(err, "Failed to parse certificate") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cbaeb82a8b3cabdba1d5d4decc67c3fe0dc7d6f | control.go |
return data, errorx.Decorate(err, "Failed to parse certificate") | <mask>
<mask> for _, cert := range certs {
<mask> parsed, err := x509.ParseCertificate(cert.Bytes)
<mask> if err != nil {
<mask> httpError(w, http.StatusBadRequest, "failed to parse certificate: %s", err)
<mask> return
<mask> }
<mask> parsedCerts = append(parsedCerts, parsed)
<mask> }
<mask>
<mask> if len(parsedCerts) == 0 {
</s> Introduce /tls/validate and validateCertificates() that will also be used by /tls/configure </s> remove httpError(w, http.StatusBadRequest, "You have specified an empty certificate")
return
</s> add return data, fmt.Errorf("You have specified an empty certificate") </s> remove httpError(w, http.StatusBadRequest, "Your certificate does not verify: %s", err)
return
</s> add return data, errorx.Decorate(err, "Your certificate does not verify") </s> remove httpError(w, http.StatusBadRequest, "Invalid certificate or key: %s", err)
return
</s> add return data, errorx.Decorate(err, "Invalid certificate or key") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cbaeb82a8b3cabdba1d5d4decc67c3fe0dc7d6f | control.go |
return data, fmt.Errorf("You have specified an empty certificate") | <mask> parsedCerts = append(parsedCerts, parsed)
<mask> }
<mask>
<mask> if len(parsedCerts) == 0 {
<mask> httpError(w, http.StatusBadRequest, "You have specified an empty certificate")
<mask> return
<mask> }
<mask>
<mask> // spew.Dump(parsedCerts)
<mask>
<mask> opts := x509.VerifyOptions{
</s> Introduce /tls/validate and validateCertificates() that will also be used by /tls/configure </s> remove httpError(w, http.StatusBadRequest, "failed to parse certificate: %s", err)
return
</s> add return data, errorx.Decorate(err, "Failed to parse certificate") </s> remove httpError(w, http.StatusBadRequest, "Your certificate does not verify: %s", err)
return
</s> add return data, errorx.Decorate(err, "Your certificate does not verify") </s> remove httpError(w, http.StatusBadRequest, "Invalid certificate or key: %s", err)
return
</s> add return data, errorx.Decorate(err, "Invalid certificate or key") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cbaeb82a8b3cabdba1d5d4decc67c3fe0dc7d6f | control.go |
_, err := mainCert.Verify(opts) | <mask> }
<mask>
<mask> // TODO: save it as a warning rather than error it out -- shouldn't be a big problem
<mask> mainCert := parsedCerts[0]
<mask> _, err = mainCert.Verify(opts)
<mask> if err != nil {
<mask> // TODO: let self-signed certs through
<mask> httpError(w, http.StatusBadRequest, "Your certificate does not verify: %s", err)
<mask> return
<mask> }
</s> Introduce /tls/validate and validateCertificates() that will also be used by /tls/configure </s> remove httpError(w, http.StatusBadRequest, "Your certificate does not verify: %s", err)
return
</s> add return data, errorx.Decorate(err, "Your certificate does not verify") </s> remove httpError(w, http.StatusBadRequest, "Invalid certificate or key: %s", err)
return
</s> add return data, errorx.Decorate(err, "Invalid certificate or key") </s> remove httpError(w, http.StatusBadRequest, "failed to parse certificate: %s", err)
return
</s> add return data, errorx.Decorate(err, "Failed to parse certificate") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cbaeb82a8b3cabdba1d5d4decc67c3fe0dc7d6f | control.go |
return data, errorx.Decorate(err, "Your certificate does not verify") | <mask> mainCert := parsedCerts[0]
<mask> _, err = mainCert.Verify(opts)
<mask> if err != nil {
<mask> // TODO: let self-signed certs through
<mask> httpError(w, http.StatusBadRequest, "Your certificate does not verify: %s", err)
<mask> return
<mask> }
<mask> // spew.Dump(chains)
<mask>
<mask> // update status
<mask> if mainCert != nil {
</s> Introduce /tls/validate and validateCertificates() that will also be used by /tls/configure </s> remove _, err = mainCert.Verify(opts)
</s> add _, err := mainCert.Verify(opts) </s> remove httpError(w, http.StatusBadRequest, "Invalid certificate or key: %s", err)
return
</s> add return data, errorx.Decorate(err, "Invalid certificate or key") </s> remove httpError(w, http.StatusBadRequest, "failed to parse certificate: %s", err)
return
</s> add return data, errorx.Decorate(err, "Failed to parse certificate") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cbaeb82a8b3cabdba1d5d4decc67c3fe0dc7d6f | control.go |
return data, nil | <mask> }
<mask> }
<mask> }
<mask>
<mask> config.TLS = data
<mask> httpUpdateConfigReloadDNSReturnOK(w, r)
<mask> }
<mask>
<mask> // unmarshalTLS handles base64-encoded certificates transparently
<mask> func unmarshalTLS(r *http.Request) (tlsConfig, error) {
<mask> data := tlsConfig{}
</s> Introduce /tls/validate and validateCertificates() that will also be used by /tls/configure </s> remove httpError(w, http.StatusBadRequest, "Invalid certificate or key: %s", err)
return
</s> add return data, errorx.Decorate(err, "Invalid certificate or key") </s> remove httpError(w, http.StatusBadRequest, "You have specified an empty certificate")
return
</s> add return data, fmt.Errorf("You have specified an empty certificate") </s> remove _, err = mainCert.Verify(opts)
</s> add _, err := mainCert.Verify(opts) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cbaeb82a8b3cabdba1d5d4decc67c3fe0dc7d6f | control.go |
http.HandleFunc("/control/tls/validate", postInstall(optionalAuth(ensurePOST(handleTLSValidate)))) | <mask>
<mask> http.HandleFunc("/control/tls/status", postInstall(optionalAuth(ensureGET(handleTLSStatus))))
<mask> http.HandleFunc("/control/tls/configure", postInstall(optionalAuth(ensurePOST(handleTLSConfigure))))
<mask> }
</s> Introduce /tls/validate and validateCertificates() that will also be used by /tls/configure </s> remove config.TLS = data
httpUpdateConfigReloadDNSReturnOK(w, r)
</s> add return data, nil </s> remove httpError(w, http.StatusBadRequest, "You have specified an empty certificate")
return
</s> add return data, fmt.Errorf("You have specified an empty certificate") </s> remove httpError(w, http.StatusBadRequest, "failed to parse certificate: %s", err)
return
</s> add return data, errorx.Decorate(err, "Failed to parse certificate") | [
"keep",
"keep",
"add",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5cbaeb82a8b3cabdba1d5d4decc67c3fe0dc7d6f | control.go |
/build2 | <mask> /AdGuardHome.yaml
<mask> /AdGuardHome.log
<mask> /data
<mask> /build
<mask> /dist
<mask> /client/node_modules
<mask> /client2/node_modules
<mask> /.gitattributes
<mask> /.gitignore
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove address = net.JoinHostPort(config.BindHost, port)
log.Printf("Go to %s://%s", proto, address)
</s> add log.Printf("Go to %s://%s", proto, net.JoinHostPort(config.BindHost, port))
if config.BetaBindPort != 0 {
log.Printf("Go to %s://%s (BETA)", proto, net.JoinHostPort(config.BindHost, strconv.Itoa(config.BetaBindPort)))
} </s> remove _ = Context.web.httpServer.Shutdown(context.TODO())
</s> add _ = web.httpServer.Shutdown(context.TODO())
}()
go func() {
_ = web.httpServerBeta.Shutdown(context.TODO()) </s> remove firstRun: Context.firstRun,
BindHost: config.BindHost,
BindPort: config.BindPort,
</s> add firstRun: Context.firstRun,
BindHost: config.BindHost,
BindPort: config.BindPort,
BetaBindPort: config.BetaBindPort, | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | .dockerignore |
/client2/node_modules | <mask> /build2
<mask> /dist
<mask> /client/node_modules
<mask> /.gitattributes
<mask> /.gitignore
<mask> /.goreleaser.yml
<mask> /changelog.config.js
<mask> /coverage.txt
<mask> /Dockerfile
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove address = net.JoinHostPort(config.BindHost, port)
log.Printf("Go to %s://%s", proto, address)
</s> add log.Printf("Go to %s://%s", proto, net.JoinHostPort(config.BindHost, port))
if config.BetaBindPort != 0 {
log.Printf("Go to %s://%s (BETA)", proto, net.JoinHostPort(config.BindHost, strconv.Itoa(config.BetaBindPort)))
} </s> remove _ = Context.web.httpServer.Shutdown(context.TODO())
</s> add _ = web.httpServer.Shutdown(context.TODO())
}()
go func() {
_ = web.httpServerBeta.Shutdown(context.TODO()) </s> remove firstRun: Context.firstRun,
BindHost: config.BindHost,
BindPort: config.BindPort,
</s> add firstRun: Context.firstRun,
BindHost: config.BindHost,
BindPort: config.BindPort,
BetaBindPort: config.BetaBindPort, | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | .dockerignore |
'NODE_VERSION': '14' | <mask> 'name': 'build'
<mask>
<mask> 'env':
<mask> 'GO_VERSION': '1.14'
<mask> 'NODE_VERSION': '13'
<mask>
<mask> 'on':
<mask> 'push':
<mask> 'branches':
<mask> - '*'
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove 'ipv4_addresses':
</s> add 'ip_addresses': </s> remove 'properties':
'1.2.3.4':
'items':
'$ref': '#/components/schemas/ClientFindSubEntry'
</s> add 'additionalProperties':
'$ref': '#/components/schemas/ClientFindSubEntry'
'example':
'1.2.3.4': 'test' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | .github/workflows/build.yml |
*.log | <mask> *-packr.go
<mask> *.db
<mask> *.snap
<mask> /bin/
<mask> /build/
<mask> /build2/
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove address = net.JoinHostPort(config.BindHost, port)
log.Printf("Go to %s://%s", proto, address)
</s> add log.Printf("Go to %s://%s", proto, net.JoinHostPort(config.BindHost, port))
if config.BetaBindPort != 0 {
log.Printf("Go to %s://%s (BETA)", proto, net.JoinHostPort(config.BindHost, strconv.Itoa(config.BetaBindPort)))
} </s> remove _ = Context.web.httpServer.Shutdown(context.TODO())
</s> add _ = web.httpServer.Shutdown(context.TODO())
}()
go func() {
_ = web.httpServerBeta.Shutdown(context.TODO()) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | .gitignore |
/build2/ | <mask> *.snap
<mask> /bin/
<mask> /build/
<mask> /data/
<mask> /dist/
<mask> /dnsfilter/tests/dnsfilter.TestLotsOfRules*.pprof
<mask> /dnsfilter/tests/top-1m.csv
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove address = net.JoinHostPort(config.BindHost, port)
log.Printf("Go to %s://%s", proto, address)
</s> add log.Printf("Go to %s://%s", proto, net.JoinHostPort(config.BindHost, port))
if config.BetaBindPort != 0 {
log.Printf("Go to %s://%s (BETA)", proto, net.JoinHostPort(config.BindHost, strconv.Itoa(config.BetaBindPort)))
} </s> remove _ = Context.web.httpServer.Shutdown(context.TODO())
</s> add _ = web.httpServer.Shutdown(context.TODO())
}()
go func() {
_ = web.httpServerBeta.Shutdown(context.TODO()) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | .gitignore |
yarn \ | <mask> git \
<mask> npm \
<mask> && rm -rf /tmp/* /var/cache/apk/*
<mask>
<mask> WORKDIR /app
<mask>
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove web.portHTTPS = tlsConf.PortHTTPS
</s> add </s> remove if reqData.Web.Port != 0 && reqData.Web.Port != config.BindPort {
</s> add if reqData.Web.Port != 0 && reqData.Web.Port != config.BindPort && reqData.Web.Port != config.BetaBindPort { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | Dockerfile |
RUN yarn --cwd client2 build | <mask>
<mask> # Prepare the client code
<mask> RUN npm --prefix client ci && npm --prefix client run build-prod
<mask>
<mask> # Download go dependencies
<mask> RUN go mod download
<mask> RUN go generate ./...
<mask>
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | Dockerfile |
yarn --cwd client2 build | <mask> client:
<mask> npm --prefix client run build-prod
<mask>
<mask> client_with_deps:
<mask> npm --prefix client ci
<mask> npm --prefix client run build-prod
<mask> yarn --cwd client2 build
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | Makefile |
yarn --cwd client2 build | <mask>
<mask> client_with_deps:
<mask> npm --prefix client ci
<mask> npm --prefix client run build-prod
<mask>
<mask> client-watch:
<mask> npm --prefix client run watch
<mask> yarn --cwd client2 start
<mask>
<mask> docker:
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | Makefile |
yarn --cwd client2 start | <mask> client-watch:
<mask> npm --prefix client run watch
<mask>
<mask> docker:
<mask> DOCKER_CLI_EXPERIMENTAL=enabled \
<mask> docker buildx build \
<mask> --build-arg VERSION=$(VERSION) \
<mask> --build-arg CHANNEL=$(CHANNEL) \
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | Makefile |
yarn --cwd client2 lint | <mask> lint: js-lint go-lint
<mask>
<mask> js-lint: dependencies
<mask> npm --prefix client run lint
<mask>
<mask> go-install-tools:
<mask> env GO=$(GO) sh ./scripts/go-install-tools.sh
<mask>
<mask> go-lint:
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | Makefile |
yarn --cwd client2 install | <mask>
<mask> dependencies:
<mask> npm --prefix client ci
<mask> $(GO) mod download
<mask>
<mask> clean:
<mask> rm -f ./AdGuardHome ./AdGuardHome.exe ./coverage.txt
<mask> rm -f -r ./build/ ./client/node_modules/ ./data/ ./$(DIST_DIR)/
<mask> # Set the GOPATH explicitly in case make clean is called from under sudo
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | Makefile |
BindHost string `yaml:"bind_host"` // BindHost is the IP address of the HTTP server to bind to
BindPort int `yaml:"bind_port"` // BindPort is the port the HTTP server
BetaBindPort int `yaml:"beta_bind_port"` // BetaBindPort is the port for new client
Users []User `yaml:"users"` // Users that can access HTTP server
ProxyURL string `yaml:"http_proxy"` // Proxy address for our HTTP client
Language string `yaml:"language"` // two-letter ISO 639-1 language code
RlimitNoFile uint `yaml:"rlimit_nofile"` // Maximum number of opened fd's per process (0: default)
DebugPProf bool `yaml:"debug_pprof"` // Enable pprof HTTP server on port 6060 | <mask> // Raw file data to avoid re-reading of configuration file
<mask> // It's reset after config is parsed
<mask> fileData []byte
<mask>
<mask> BindHost string `yaml:"bind_host"` // BindHost is the IP address of the HTTP server to bind to
<mask> BindPort int `yaml:"bind_port"` // BindPort is the port the HTTP server
<mask> Users []User `yaml:"users"` // Users that can access HTTP server
<mask> ProxyURL string `yaml:"http_proxy"` // Proxy address for our HTTP client
<mask> Language string `yaml:"language"` // two-letter ISO 639-1 language code
<mask> RlimitNoFile uint `yaml:"rlimit_nofile"` // Maximum number of opened fd's per process (0: default)
<mask> DebugPProf bool `yaml:"debug_pprof"` // Enable pprof HTTP server on port 6060
<mask>
<mask> // TTL for a web session (in hours)
<mask> // An active session is automatically refreshed once a day.
<mask> WebSessionTTLHours uint32 `yaml:"web_session_ttl"`
<mask>
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove firstRun bool
BindHost string
BindPort int
PortHTTPS int
</s> add firstRun bool
BindHost string
BindPort int
BetaBindPort int
PortHTTPS int </s> remove // for Rewritten:
</s> add // for Rewrite: </s> remove var address string
</s> add </s> remove portHTTPS int
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | internal/home/config.go |
BindPort: 3000,
BetaBindPort: 0,
BindHost: "0.0.0.0", | <mask> }
<mask>
<mask> // initialize to default values, will be changed later when reading config or parsing command line
<mask> var config = configuration{
<mask> BindPort: 3000,
<mask> BindHost: "0.0.0.0",
<mask> DNS: dnsConfig{
<mask> BindHost: "0.0.0.0",
<mask> Port: 53,
<mask> StatsInterval: 1,
<mask> FilteringConfig: dnsforward.FilteringConfig{
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove firstRun: Context.firstRun,
BindHost: config.BindHost,
BindPort: config.BindPort,
</s> add firstRun: Context.firstRun,
BindHost: config.BindHost,
BindPort: config.BindPort,
BetaBindPort: config.BetaBindPort, </s> remove var address string
</s> add </s> remove _ = Context.web.httpServer.Shutdown(context.TODO())
</s> add _ = web.httpServer.Shutdown(context.TODO())
}()
go func() {
_ = web.httpServerBeta.Shutdown(context.TODO()) </s> remove 'format': 'int32'
</s> add 'format': 'uint16' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | internal/home/config.go |
if updateChannel == "none" || updateChannel == "edge" {
config.BetaBindPort = 3001
} | <mask> config.DHCP.Conf4.ICMPTimeout = 1000
<mask> config.DHCP.Conf6.LeaseDuration = 86400
<mask> }
<mask>
<mask> // getConfigFilename returns path to the current config file
<mask> func (c *configuration) getConfigFilename() string {
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove var address string
</s> add </s> remove BindHost string `yaml:"bind_host"` // BindHost is the IP address of the HTTP server to bind to
BindPort int `yaml:"bind_port"` // BindPort is the port the HTTP server
Users []User `yaml:"users"` // Users that can access HTTP server
ProxyURL string `yaml:"http_proxy"` // Proxy address for our HTTP client
Language string `yaml:"language"` // two-letter ISO 639-1 language code
RlimitNoFile uint `yaml:"rlimit_nofile"` // Maximum number of opened fd's per process (0: default)
DebugPProf bool `yaml:"debug_pprof"` // Enable pprof HTTP server on port 6060
</s> add BindHost string `yaml:"bind_host"` // BindHost is the IP address of the HTTP server to bind to
BindPort int `yaml:"bind_port"` // BindPort is the port the HTTP server
BetaBindPort int `yaml:"beta_bind_port"` // BetaBindPort is the port for new client
Users []User `yaml:"users"` // Users that can access HTTP server
ProxyURL string `yaml:"http_proxy"` // Proxy address for our HTTP client
Language string `yaml:"language"` // two-letter ISO 639-1 language code
RlimitNoFile uint `yaml:"rlimit_nofile"` // Maximum number of opened fd's per process (0: default)
DebugPProf bool `yaml:"debug_pprof"` // Enable pprof HTTP server on port 6060 </s> remove // for Rewritten:
</s> add // for Rewrite: </s> remove BindPort: 3000,
BindHost: "0.0.0.0",
</s> add BindPort: 3000,
BetaBindPort: 0,
BindHost: "0.0.0.0", | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | internal/home/config.go |
Host: net.JoinHostPort(host, strconv.Itoa(Context.web.conf.PortHTTPS)), | <mask> }
<mask> // construct new URL to redirect to
<mask> newURL := url.URL{
<mask> Scheme: "https",
<mask> Host: net.JoinHostPort(host, strconv.Itoa(Context.web.portHTTPS)),
<mask> Path: r.URL.Path,
<mask> RawQuery: r.URL.RawQuery,
<mask> }
<mask> http.Redirect(w, r, newURL.String(), http.StatusTemporaryRedirect)
<mask> return
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove err := web.httpServer.ListenAndServe()
</s> add err := <-errs </s> remove address = net.JoinHostPort(config.BindHost, port)
log.Printf("Go to %s://%s", proto, address)
</s> add log.Printf("Go to %s://%s", proto, net.JoinHostPort(config.BindHost, port))
if config.BetaBindPort != 0 {
log.Printf("Go to %s://%s (BETA)", proto, net.JoinHostPort(config.BindHost, strconv.Itoa(config.BetaBindPort)))
} </s> remove address = net.JoinHostPort(addr, strconv.Itoa(config.BindPort))
log.Printf("Go to %s://%s", proto, address)
</s> add log.Printf("Go to %s://%s", proto, net.JoinHostPort(addr, strconv.Itoa(config.BindPort)))
if config.BetaBindPort != 0 {
log.Printf("Go to %s://%s (BETA)", proto, net.JoinHostPort(addr, strconv.Itoa(config.BetaBindPort)))
} </s> remove address = net.JoinHostPort(config.BindHost, port)
log.Printf("Go to %s://%s", proto, address)
</s> add log.Printf("Go to %s://%s", proto, net.JoinHostPort(config.BindHost, port))
if config.BetaBindPort != 0 {
log.Printf("Go to %s://%s (BETA)", proto, net.JoinHostPort(config.BindHost, strconv.Itoa(config.BetaBindPort)))
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | internal/home/control.go |
// for Rewrite: | <mask>
<mask> // for FilteredBlockedService:
<mask> SvcName string `json:"service_name"`
<mask>
<mask> // for Rewritten:
<mask> CanonName string `json:"cname"` // CNAME value
<mask> IPList []net.IP `json:"ip_addrs"` // list of IP addresses
<mask> }
<mask>
<mask> func (f *Filtering) handleCheckHost(w http.ResponseWriter, r *http.Request) {
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove var address string
</s> add </s> remove BindHost string `yaml:"bind_host"` // BindHost is the IP address of the HTTP server to bind to
BindPort int `yaml:"bind_port"` // BindPort is the port the HTTP server
Users []User `yaml:"users"` // Users that can access HTTP server
ProxyURL string `yaml:"http_proxy"` // Proxy address for our HTTP client
Language string `yaml:"language"` // two-letter ISO 639-1 language code
RlimitNoFile uint `yaml:"rlimit_nofile"` // Maximum number of opened fd's per process (0: default)
DebugPProf bool `yaml:"debug_pprof"` // Enable pprof HTTP server on port 6060
</s> add BindHost string `yaml:"bind_host"` // BindHost is the IP address of the HTTP server to bind to
BindPort int `yaml:"bind_port"` // BindPort is the port the HTTP server
BetaBindPort int `yaml:"beta_bind_port"` // BetaBindPort is the port for new client
Users []User `yaml:"users"` // Users that can access HTTP server
ProxyURL string `yaml:"http_proxy"` // Proxy address for our HTTP client
Language string `yaml:"language"` // two-letter ISO 639-1 language code
RlimitNoFile uint `yaml:"rlimit_nofile"` // Maximum number of opened fd's per process (0: default)
DebugPProf bool `yaml:"debug_pprof"` // Enable pprof HTTP server on port 6060 </s> remove firstRun bool
BindHost string
BindPort int
PortHTTPS int
</s> add firstRun bool
BindHost string
BindPort int
BetaBindPort int
PortHTTPS int | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | internal/home/controlfiltering.go |
"strings" | <mask> "path/filepath"
<mask> "runtime"
<mask> "strconv"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/util"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/sysutil"
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove address = net.JoinHostPort(addr, strconv.Itoa(config.BindPort))
log.Printf("Go to %s://%s", proto, address)
</s> add log.Printf("Go to %s://%s", proto, net.JoinHostPort(addr, strconv.Itoa(config.BindPort)))
if config.BetaBindPort != 0 {
log.Printf("Go to %s://%s (BETA)", proto, net.JoinHostPort(addr, strconv.Itoa(config.BetaBindPort)))
} </s> remove if reqData.Web.Port != 0 && reqData.Web.Port != config.BindPort {
</s> add if reqData.Web.Port != 0 && reqData.Web.Port != config.BindPort && reqData.Web.Port != config.BetaBindPort { </s> remove _ = Context.web.httpServer.Shutdown(context.TODO())
</s> add _ = web.httpServer.Shutdown(context.TODO())
}()
go func() {
_ = web.httpServerBeta.Shutdown(context.TODO()) </s> remove firstRun: Context.firstRun,
BindHost: config.BindHost,
BindPort: config.BindPort,
</s> add firstRun: Context.firstRun,
BindHost: config.BindHost,
BindPort: config.BindPort,
BetaBindPort: config.BetaBindPort, | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | internal/home/controlinstall.go |
if reqData.Web.Port != 0 && reqData.Web.Port != config.BindPort && reqData.Web.Port != config.BetaBindPort { | <mask> httpError(w, http.StatusBadRequest, "Failed to parse 'check_config' JSON data: %s", err)
<mask> return
<mask> }
<mask>
<mask> if reqData.Web.Port != 0 && reqData.Web.Port != config.BindPort {
<mask> err = util.CheckPortAvailable(reqData.Web.IP, reqData.Web.Port)
<mask> if err != nil {
<mask> respData.Web.Status = fmt.Sprintf("%v", err)
<mask> }
<mask> }
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove address = net.JoinHostPort(config.BindHost, port)
log.Printf("Go to %s://%s", proto, address)
</s> add log.Printf("Go to %s://%s", proto, net.JoinHostPort(config.BindHost, port))
if config.BetaBindPort != 0 {
log.Printf("Go to %s://%s (BETA)", proto, net.JoinHostPort(config.BindHost, strconv.Itoa(config.BetaBindPort)))
} </s> remove web.portHTTPS = tlsConf.PortHTTPS
</s> add </s> remove err := web.httpServer.ListenAndServe()
</s> add err := <-errs </s> remove address = net.JoinHostPort(config.BindHost, port)
log.Printf("Go to %s://%s", proto, address)
</s> add log.Printf("Go to %s://%s", proto, net.JoinHostPort(config.BindHost, port))
if config.BetaBindPort != 0 {
log.Printf("Go to %s://%s (BETA)", proto, net.JoinHostPort(config.BindHost, strconv.Itoa(config.BetaBindPort)))
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | internal/home/controlinstall.go |
dst.BetaBindPort = src.BetaBindPort | <mask> // Copy installation parameters between two configuration objects
<mask> func copyInstallSettings(dst, src *configuration) {
<mask> dst.BindHost = src.BindHost
<mask> dst.BindPort = src.BindPort
<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
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove _ = Context.web.httpServer.Shutdown(context.TODO())
</s> add _ = web.httpServer.Shutdown(context.TODO())
}()
go func() {
_ = web.httpServerBeta.Shutdown(context.TODO()) </s> remove web.portHTTPS = tlsConf.PortHTTPS
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | internal/home/controlinstall.go |
_ = web.httpServer.Shutdown(context.TODO())
}()
go func() {
_ = web.httpServerBeta.Shutdown(context.TODO()) | <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> _ = Context.web.httpServer.Shutdown(context.TODO())
<mask> }()
<mask> }
<mask> }
<mask>
<mask> func (web *Web) registerInstallHandlers() {
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove err := web.httpServer.ListenAndServe()
</s> add err := <-errs </s> remove address = net.JoinHostPort(config.BindHost, port)
log.Printf("Go to %s://%s", proto, address)
</s> add log.Printf("Go to %s://%s", proto, net.JoinHostPort(config.BindHost, port))
if config.BetaBindPort != 0 {
log.Printf("Go to %s://%s (BETA)", proto, net.JoinHostPort(config.BindHost, strconv.Itoa(config.BetaBindPort)))
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | internal/home/controlinstall.go |
firstRun: Context.firstRun,
BindHost: config.BindHost,
BindPort: config.BindPort,
BetaBindPort: config.BetaBindPort, | <mask> log.Fatalf("Can't initialize TLS module")
<mask> }
<mask>
<mask> webConf := webConfig{
<mask> firstRun: Context.firstRun,
<mask> BindHost: config.BindHost,
<mask> BindPort: config.BindPort,
<mask>
<mask> ReadTimeout: ReadTimeout,
<mask> ReadHeaderTimeout: ReadHeaderTimeout,
<mask> WriteTimeout: WriteTimeout,
<mask> }
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove BindPort: 3000,
BindHost: "0.0.0.0",
</s> add BindPort: 3000,
BetaBindPort: 0,
BindHost: "0.0.0.0", </s> remove Addr: address,
</s> add Addr: net.JoinHostPort(web.conf.BindHost, strconv.Itoa(web.conf.BindPort)), </s> remove err := web.httpServer.ListenAndServe()
</s> add err := <-errs </s> remove address = net.JoinHostPort(addr, strconv.Itoa(config.BindPort))
log.Printf("Go to %s://%s", proto, address)
</s> add log.Printf("Go to %s://%s", proto, net.JoinHostPort(addr, strconv.Itoa(config.BindPort)))
if config.BetaBindPort != 0 {
log.Printf("Go to %s://%s (BETA)", proto, net.JoinHostPort(addr, strconv.Itoa(config.BetaBindPort)))
} </s> remove Host: net.JoinHostPort(host, strconv.Itoa(Context.web.portHTTPS)),
</s> add Host: net.JoinHostPort(host, strconv.Itoa(Context.web.conf.PortHTTPS)), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | internal/home/home.go |
<mask>
<mask> // prints IP addresses which user can use to open the admin interface
<mask> // proto is either "http" or "https"
<mask> func printHTTPAddresses(proto string) {
<mask> var address string
<mask>
<mask> tlsConf := tlsConfigSettings{}
<mask> if Context.tls != nil {
<mask> Context.tls.WriteDiskConfig(&tlsConf)
<mask> }
<mask>
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove address = net.JoinHostPort(config.BindHost, port)
log.Printf("Go to %s://%s", proto, address)
</s> add log.Printf("Go to %s://%s", proto, net.JoinHostPort(config.BindHost, port))
if config.BetaBindPort != 0 {
log.Printf("Go to %s://%s (BETA)", proto, net.JoinHostPort(config.BindHost, strconv.Itoa(config.BetaBindPort)))
} </s> remove // for Rewritten:
</s> add // for Rewrite: </s> remove err := web.httpServer.ListenAndServe()
</s> add err := <-errs </s> remove BindHost string `yaml:"bind_host"` // BindHost is the IP address of the HTTP server to bind to
BindPort int `yaml:"bind_port"` // BindPort is the port the HTTP server
Users []User `yaml:"users"` // Users that can access HTTP server
ProxyURL string `yaml:"http_proxy"` // Proxy address for our HTTP client
Language string `yaml:"language"` // two-letter ISO 639-1 language code
RlimitNoFile uint `yaml:"rlimit_nofile"` // Maximum number of opened fd's per process (0: default)
DebugPProf bool `yaml:"debug_pprof"` // Enable pprof HTTP server on port 6060
</s> add BindHost string `yaml:"bind_host"` // BindHost is the IP address of the HTTP server to bind to
BindPort int `yaml:"bind_port"` // BindPort is the port the HTTP server
BetaBindPort int `yaml:"beta_bind_port"` // BetaBindPort is the port for new client
Users []User `yaml:"users"` // Users that can access HTTP server
ProxyURL string `yaml:"http_proxy"` // Proxy address for our HTTP client
Language string `yaml:"language"` // two-letter ISO 639-1 language code
RlimitNoFile uint `yaml:"rlimit_nofile"` // Maximum number of opened fd's per process (0: default)
DebugPProf bool `yaml:"debug_pprof"` // Enable pprof HTTP server on port 6060 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | internal/home/home.go |
|
log.Printf("Go to %s://%s", proto, net.JoinHostPort(config.BindHost, port))
if config.BetaBindPort != 0 {
log.Printf("Go to %s://%s (BETA)", proto, net.JoinHostPort(config.BindHost, strconv.Itoa(config.BetaBindPort)))
} | <mask> log.Println("AdGuard Home is available on the following addresses:")
<mask> ifaces, err := util.GetValidNetInterfacesForWeb()
<mask> if err != nil {
<mask> // That's weird, but we'll ignore it
<mask> address = net.JoinHostPort(config.BindHost, port)
<mask> log.Printf("Go to %s://%s", proto, address)
<mask> return
<mask> }
<mask>
<mask> for _, iface := range ifaces {
<mask> for _, addr := range iface.Addresses {
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove address = net.JoinHostPort(addr, strconv.Itoa(config.BindPort))
log.Printf("Go to %s://%s", proto, address)
</s> add log.Printf("Go to %s://%s", proto, net.JoinHostPort(addr, strconv.Itoa(config.BindPort)))
if config.BetaBindPort != 0 {
log.Printf("Go to %s://%s (BETA)", proto, net.JoinHostPort(addr, strconv.Itoa(config.BetaBindPort)))
} </s> remove address = net.JoinHostPort(config.BindHost, port)
log.Printf("Go to %s://%s", proto, address)
</s> add log.Printf("Go to %s://%s", proto, net.JoinHostPort(config.BindHost, port))
if config.BetaBindPort != 0 {
log.Printf("Go to %s://%s (BETA)", proto, net.JoinHostPort(config.BindHost, strconv.Itoa(config.BetaBindPort)))
} </s> remove err := web.httpServer.ListenAndServe()
</s> add err := <-errs </s> remove if reqData.Web.Port != 0 && reqData.Web.Port != config.BindPort {
</s> add if reqData.Web.Port != 0 && reqData.Web.Port != config.BindPort && reqData.Web.Port != config.BetaBindPort { </s> remove var address string
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | internal/home/home.go |
log.Printf("Go to %s://%s", proto, net.JoinHostPort(addr, strconv.Itoa(config.BindPort)))
if config.BetaBindPort != 0 {
log.Printf("Go to %s://%s (BETA)", proto, net.JoinHostPort(addr, strconv.Itoa(config.BetaBindPort)))
} | <mask> }
<mask>
<mask> for _, iface := range ifaces {
<mask> for _, addr := range iface.Addresses {
<mask> address = net.JoinHostPort(addr, strconv.Itoa(config.BindPort))
<mask> log.Printf("Go to %s://%s", proto, address)
<mask> }
<mask> }
<mask> } else {
<mask> address = net.JoinHostPort(config.BindHost, port)
<mask> log.Printf("Go to %s://%s", proto, address)
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove address = net.JoinHostPort(config.BindHost, port)
log.Printf("Go to %s://%s", proto, address)
</s> add log.Printf("Go to %s://%s", proto, net.JoinHostPort(config.BindHost, port))
if config.BetaBindPort != 0 {
log.Printf("Go to %s://%s (BETA)", proto, net.JoinHostPort(config.BindHost, strconv.Itoa(config.BetaBindPort)))
} </s> remove address = net.JoinHostPort(config.BindHost, port)
log.Printf("Go to %s://%s", proto, address)
</s> add log.Printf("Go to %s://%s", proto, net.JoinHostPort(config.BindHost, port))
if config.BetaBindPort != 0 {
log.Printf("Go to %s://%s (BETA)", proto, net.JoinHostPort(config.BindHost, strconv.Itoa(config.BetaBindPort)))
} </s> remove address := net.JoinHostPort(web.conf.BindHost, strconv.Itoa(web.conf.BindPort))
</s> add </s> remove var address string
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | internal/home/home.go |
log.Printf("Go to %s://%s", proto, net.JoinHostPort(config.BindHost, port))
if config.BetaBindPort != 0 {
log.Printf("Go to %s://%s (BETA)", proto, net.JoinHostPort(config.BindHost, strconv.Itoa(config.BetaBindPort)))
} | <mask> log.Printf("Go to %s://%s", proto, address)
<mask> }
<mask> }
<mask> } else {
<mask> address = net.JoinHostPort(config.BindHost, port)
<mask> log.Printf("Go to %s://%s", proto, address)
<mask> }
<mask> }
<mask>
<mask> // -------------------
<mask> // first run / install
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove address = net.JoinHostPort(addr, strconv.Itoa(config.BindPort))
log.Printf("Go to %s://%s", proto, address)
</s> add log.Printf("Go to %s://%s", proto, net.JoinHostPort(addr, strconv.Itoa(config.BindPort)))
if config.BetaBindPort != 0 {
log.Printf("Go to %s://%s (BETA)", proto, net.JoinHostPort(addr, strconv.Itoa(config.BetaBindPort)))
} </s> remove address = net.JoinHostPort(config.BindHost, port)
log.Printf("Go to %s://%s", proto, address)
</s> add log.Printf("Go to %s://%s", proto, net.JoinHostPort(config.BindHost, port))
if config.BetaBindPort != 0 {
log.Printf("Go to %s://%s (BETA)", proto, net.JoinHostPort(config.BindHost, strconv.Itoa(config.BetaBindPort)))
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | internal/home/home.go |
firstRun bool
BindHost string
BindPort int
BetaBindPort int
PortHTTPS int | <mask> WriteTimeout = 10 * time.Second
<mask> )
<mask>
<mask> type webConfig struct {
<mask> firstRun bool
<mask> BindHost string
<mask> BindPort int
<mask> PortHTTPS int
<mask>
<mask> // ReadTimeout is an option to pass to http.Server for setting an
<mask> // appropriate field.
<mask> ReadTimeout time.Duration
<mask>
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove BindHost string `yaml:"bind_host"` // BindHost is the IP address of the HTTP server to bind to
BindPort int `yaml:"bind_port"` // BindPort is the port the HTTP server
Users []User `yaml:"users"` // Users that can access HTTP server
ProxyURL string `yaml:"http_proxy"` // Proxy address for our HTTP client
Language string `yaml:"language"` // two-letter ISO 639-1 language code
RlimitNoFile uint `yaml:"rlimit_nofile"` // Maximum number of opened fd's per process (0: default)
DebugPProf bool `yaml:"debug_pprof"` // Enable pprof HTTP server on port 6060
</s> add BindHost string `yaml:"bind_host"` // BindHost is the IP address of the HTTP server to bind to
BindPort int `yaml:"bind_port"` // BindPort is the port the HTTP server
BetaBindPort int `yaml:"beta_bind_port"` // BetaBindPort is the port for new client
Users []User `yaml:"users"` // Users that can access HTTP server
ProxyURL string `yaml:"http_proxy"` // Proxy address for our HTTP client
Language string `yaml:"language"` // two-letter ISO 639-1 language code
RlimitNoFile uint `yaml:"rlimit_nofile"` // Maximum number of opened fd's per process (0: default)
DebugPProf bool `yaml:"debug_pprof"` // Enable pprof HTTP server on port 6060 </s> remove portHTTPS int
</s> add </s> remove // for Rewritten:
</s> add // for Rewrite: | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | internal/home/web.go |
<mask> // Web - module object
<mask> type Web struct {
<mask> conf *webConfig
<mask> forceHTTPS bool
<mask> portHTTPS int
<mask> httpServer *http.Server // HTTP module
<mask> httpsServer HTTPSServer // HTTPS module
<mask> }
<mask>
<mask> // CreateWeb - create module
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove firstRun bool
BindHost string
BindPort int
PortHTTPS int
</s> add firstRun bool
BindHost string
BindPort int
BetaBindPort int
PortHTTPS int </s> remove BindHost string `yaml:"bind_host"` // BindHost is the IP address of the HTTP server to bind to
BindPort int `yaml:"bind_port"` // BindPort is the port the HTTP server
Users []User `yaml:"users"` // Users that can access HTTP server
ProxyURL string `yaml:"http_proxy"` // Proxy address for our HTTP client
Language string `yaml:"language"` // two-letter ISO 639-1 language code
RlimitNoFile uint `yaml:"rlimit_nofile"` // Maximum number of opened fd's per process (0: default)
DebugPProf bool `yaml:"debug_pprof"` // Enable pprof HTTP server on port 6060
</s> add BindHost string `yaml:"bind_host"` // BindHost is the IP address of the HTTP server to bind to
BindPort int `yaml:"bind_port"` // BindPort is the port the HTTP server
BetaBindPort int `yaml:"beta_bind_port"` // BetaBindPort is the port for new client
Users []User `yaml:"users"` // Users that can access HTTP server
ProxyURL string `yaml:"http_proxy"` // Proxy address for our HTTP client
Language string `yaml:"language"` // two-letter ISO 639-1 language code
RlimitNoFile uint `yaml:"rlimit_nofile"` // Maximum number of opened fd's per process (0: default)
DebugPProf bool `yaml:"debug_pprof"` // Enable pprof HTTP server on port 6060 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | internal/home/web.go |
|
// handlerBeta is the handler for new client.
handlerBeta http.Handler
// installerBeta is the pre-install handler for new client.
installerBeta http.Handler
// httpServerBeta is a server for new client.
httpServerBeta *http.Server | <mask> forceHTTPS bool
<mask> httpServer *http.Server // HTTP module
<mask> httpsServer HTTPSServer // HTTPS module
<mask> }
<mask>
<mask> // CreateWeb - create module
<mask> func CreateWeb(conf *webConfig) *Web {
<mask> log.Info("Initialize web module")
<mask>
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove portHTTPS int
</s> add </s> remove BindHost string `yaml:"bind_host"` // BindHost is the IP address of the HTTP server to bind to
BindPort int `yaml:"bind_port"` // BindPort is the port the HTTP server
Users []User `yaml:"users"` // Users that can access HTTP server
ProxyURL string `yaml:"http_proxy"` // Proxy address for our HTTP client
Language string `yaml:"language"` // two-letter ISO 639-1 language code
RlimitNoFile uint `yaml:"rlimit_nofile"` // Maximum number of opened fd's per process (0: default)
DebugPProf bool `yaml:"debug_pprof"` // Enable pprof HTTP server on port 6060
</s> add BindHost string `yaml:"bind_host"` // BindHost is the IP address of the HTTP server to bind to
BindPort int `yaml:"bind_port"` // BindPort is the port the HTTP server
BetaBindPort int `yaml:"beta_bind_port"` // BetaBindPort is the port for new client
Users []User `yaml:"users"` // Users that can access HTTP server
ProxyURL string `yaml:"http_proxy"` // Proxy address for our HTTP client
Language string `yaml:"language"` // two-letter ISO 639-1 language code
RlimitNoFile uint `yaml:"rlimit_nofile"` // Maximum number of opened fd's per process (0: default)
DebugPProf bool `yaml:"debug_pprof"` // Enable pprof HTTP server on port 6060 </s> remove // for Rewritten:
</s> add // for Rewrite: </s> remove var address string
</s> add </s> remove firstRun bool
BindHost string
BindPort int
PortHTTPS int
</s> add firstRun bool
BindHost string
BindPort int
BetaBindPort int
PortHTTPS int | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | internal/home/web.go |
boxBeta := packr.NewBox("../../build2/static") | <mask> w.conf = conf
<mask>
<mask> // Initialize and run the admin Web interface
<mask> box := packr.NewBox("../../build/static")
<mask>
<mask> // if not configured, redirect / to /install.html, otherwise redirect /install.html to /
<mask> Context.mux.Handle("/", withMiddlewares(http.FileServer(box), gziphandler.GzipHandler, optionalAuthHandler, postInstallHandler))
<mask> w.handlerBeta = withMiddlewares(http.FileServer(boxBeta), gziphandler.GzipHandler, optionalAuthHandler, postInstallHandler)
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove Context.mux.Handle("/", postInstallHandler(optionalAuthHandler(gziphandler.GzipHandler(http.FileServer(box)))))
</s> add Context.mux.Handle("/", withMiddlewares(http.FileServer(box), gziphandler.GzipHandler, optionalAuthHandler, postInstallHandler))
w.handlerBeta = withMiddlewares(http.FileServer(boxBeta), gziphandler.GzipHandler, optionalAuthHandler, postInstallHandler) </s> remove address = net.JoinHostPort(config.BindHost, port)
log.Printf("Go to %s://%s", proto, address)
</s> add log.Printf("Go to %s://%s", proto, net.JoinHostPort(config.BindHost, port))
if config.BetaBindPort != 0 {
log.Printf("Go to %s://%s (BETA)", proto, net.JoinHostPort(config.BindHost, strconv.Itoa(config.BetaBindPort)))
} </s> remove var address string
</s> add </s> remove Host: net.JoinHostPort(host, strconv.Itoa(Context.web.portHTTPS)),
</s> add Host: net.JoinHostPort(host, strconv.Itoa(Context.web.conf.PortHTTPS)), | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | internal/home/web.go |
Context.mux.Handle("/", withMiddlewares(http.FileServer(box), gziphandler.GzipHandler, optionalAuthHandler, postInstallHandler))
w.handlerBeta = withMiddlewares(http.FileServer(boxBeta), gziphandler.GzipHandler, optionalAuthHandler, postInstallHandler) | <mask> // Initialize and run the admin Web interface
<mask> box := packr.NewBox("../../build/static")
<mask>
<mask> // if not configured, redirect / to /install.html, otherwise redirect /install.html to /
<mask> Context.mux.Handle("/", postInstallHandler(optionalAuthHandler(gziphandler.GzipHandler(http.FileServer(box)))))
<mask>
<mask> // add handlers for /install paths, we only need them when we're not configured yet
<mask> if conf.firstRun {
<mask> log.Info("This is the first launch of AdGuard Home, redirecting everything to /install.html ")
<mask> Context.mux.Handle("/install.html", preInstallHandler(http.FileServer(box)))
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove address := net.JoinHostPort(web.conf.BindHost, strconv.Itoa(web.conf.BindPort))
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | internal/home/web.go |
w.installerBeta = preInstallHandler(http.FileServer(boxBeta)) | <mask> log.Info("This is the first launch of AdGuard Home, redirecting everything to /install.html ")
<mask> Context.mux.Handle("/install.html", preInstallHandler(http.FileServer(box)))
<mask> w.registerInstallHandlers()
<mask> // This must be removed in API v1.
<mask> w.registerBetaInstallHandlers()
<mask> } else {
<mask> registerControlHandlers()
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove Context.mux.Handle("/", postInstallHandler(optionalAuthHandler(gziphandler.GzipHandler(http.FileServer(box)))))
</s> add Context.mux.Handle("/", withMiddlewares(http.FileServer(box), gziphandler.GzipHandler, optionalAuthHandler, postInstallHandler))
w.handlerBeta = withMiddlewares(http.FileServer(boxBeta), gziphandler.GzipHandler, optionalAuthHandler, postInstallHandler) </s> remove address = net.JoinHostPort(config.BindHost, port)
log.Printf("Go to %s://%s", proto, address)
</s> add log.Printf("Go to %s://%s", proto, net.JoinHostPort(config.BindHost, port))
if config.BetaBindPort != 0 {
log.Printf("Go to %s://%s (BETA)", proto, net.JoinHostPort(config.BindHost, strconv.Itoa(config.BetaBindPort)))
} </s> remove _ = Context.web.httpServer.Shutdown(context.TODO())
</s> add _ = web.httpServer.Shutdown(context.TODO())
}()
go func() {
_ = web.httpServerBeta.Shutdown(context.TODO()) </s> remove BindHost string `yaml:"bind_host"` // BindHost is the IP address of the HTTP server to bind to
BindPort int `yaml:"bind_port"` // BindPort is the port the HTTP server
Users []User `yaml:"users"` // Users that can access HTTP server
ProxyURL string `yaml:"http_proxy"` // Proxy address for our HTTP client
Language string `yaml:"language"` // two-letter ISO 639-1 language code
RlimitNoFile uint `yaml:"rlimit_nofile"` // Maximum number of opened fd's per process (0: default)
DebugPProf bool `yaml:"debug_pprof"` // Enable pprof HTTP server on port 6060
</s> add BindHost string `yaml:"bind_host"` // BindHost is the IP address of the HTTP server to bind to
BindPort int `yaml:"bind_port"` // BindPort is the port the HTTP server
BetaBindPort int `yaml:"beta_bind_port"` // BetaBindPort is the port for new client
Users []User `yaml:"users"` // Users that can access HTTP server
ProxyURL string `yaml:"http_proxy"` // Proxy address for our HTTP client
Language string `yaml:"language"` // two-letter ISO 639-1 language code
RlimitNoFile uint `yaml:"rlimit_nofile"` // Maximum number of opened fd's per process (0: default)
DebugPProf bool `yaml:"debug_pprof"` // Enable pprof HTTP server on port 6060 | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | internal/home/web.go |
// This must be removed in API v1.
w.registerBetaInstallHandlers() | <mask> log.Info("This is the first launch of AdGuard Home, redirecting everything to /install.html ")
<mask> Context.mux.Handle("/install.html", preInstallHandler(http.FileServer(box)))
<mask> w.installerBeta = preInstallHandler(http.FileServer(boxBeta))
<mask> w.registerInstallHandlers()
<mask> } else {
<mask> registerControlHandlers()
<mask> }
<mask>
<mask> w.httpsServer.cond = sync.NewCond(&w.httpsServer.condLock)
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove Context.mux.Handle("/", postInstallHandler(optionalAuthHandler(gziphandler.GzipHandler(http.FileServer(box)))))
</s> add Context.mux.Handle("/", withMiddlewares(http.FileServer(box), gziphandler.GzipHandler, optionalAuthHandler, postInstallHandler))
w.handlerBeta = withMiddlewares(http.FileServer(boxBeta), gziphandler.GzipHandler, optionalAuthHandler, postInstallHandler) </s> remove address = net.JoinHostPort(config.BindHost, port)
log.Printf("Go to %s://%s", proto, address)
</s> add log.Printf("Go to %s://%s", proto, net.JoinHostPort(config.BindHost, port))
if config.BetaBindPort != 0 {
log.Printf("Go to %s://%s (BETA)", proto, net.JoinHostPort(config.BindHost, strconv.Itoa(config.BetaBindPort)))
} </s> remove address = net.JoinHostPort(addr, strconv.Itoa(config.BindPort))
log.Printf("Go to %s://%s", proto, address)
</s> add log.Printf("Go to %s://%s", proto, net.JoinHostPort(addr, strconv.Itoa(config.BindPort)))
if config.BetaBindPort != 0 {
log.Printf("Go to %s://%s (BETA)", proto, net.JoinHostPort(addr, strconv.Itoa(config.BetaBindPort)))
} | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | internal/home/web.go |
<mask> func (web *Web) TLSConfigChanged(tlsConf tlsConfigSettings) {
<mask> log.Debug("Web: applying new TLS configuration")
<mask> web.conf.PortHTTPS = tlsConf.PortHTTPS
<mask> web.forceHTTPS = (tlsConf.ForceHTTPS && tlsConf.Enabled && tlsConf.PortHTTPS != 0)
<mask> web.portHTTPS = tlsConf.PortHTTPS
<mask>
<mask> enabled := tlsConf.Enabled &&
<mask> tlsConf.PortHTTPS != 0 &&
<mask> len(tlsConf.PrivateKeyData) != 0 &&
<mask> len(tlsConf.CertificateChainData) != 0
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove if reqData.Web.Port != 0 && reqData.Web.Port != config.BindPort {
</s> add if reqData.Web.Port != 0 && reqData.Web.Port != config.BindPort && reqData.Web.Port != config.BetaBindPort { </s> remove address = net.JoinHostPort(config.BindHost, port)
log.Printf("Go to %s://%s", proto, address)
</s> add log.Printf("Go to %s://%s", proto, net.JoinHostPort(config.BindHost, port))
if config.BetaBindPort != 0 {
log.Printf("Go to %s://%s (BETA)", proto, net.JoinHostPort(config.BindHost, strconv.Itoa(config.BetaBindPort)))
} </s> remove address = net.JoinHostPort(addr, strconv.Itoa(config.BindPort))
log.Printf("Go to %s://%s", proto, address)
</s> add log.Printf("Go to %s://%s", proto, net.JoinHostPort(addr, strconv.Itoa(config.BindPort)))
if config.BetaBindPort != 0 {
log.Printf("Go to %s://%s (BETA)", proto, net.JoinHostPort(addr, strconv.Itoa(config.BetaBindPort)))
} </s> remove address = net.JoinHostPort(config.BindHost, port)
log.Printf("Go to %s://%s", proto, address)
</s> add log.Printf("Go to %s://%s", proto, net.JoinHostPort(config.BindHost, port))
if config.BetaBindPort != 0 {
log.Printf("Go to %s://%s (BETA)", proto, net.JoinHostPort(config.BindHost, strconv.Itoa(config.BetaBindPort)))
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | internal/home/web.go |
|
errs := make(chan error, 2) | <mask> for !web.httpsServer.shutdown {
<mask> printHTTPAddresses("http")
<mask>
<mask> // we need to have new instance, because after Shutdown() the Server is not usable
<mask> web.httpServer = &http.Server{
<mask> ErrorLog: log.StdLog("web: http", log.DEBUG),
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove address := net.JoinHostPort(web.conf.BindHost, strconv.Itoa(web.conf.BindPort))
</s> add </s> remove Addr: address,
</s> add Addr: net.JoinHostPort(web.conf.BindHost, strconv.Itoa(web.conf.BindPort)), </s> remove Context.mux.Handle("/", postInstallHandler(optionalAuthHandler(gziphandler.GzipHandler(http.FileServer(box)))))
</s> add Context.mux.Handle("/", withMiddlewares(http.FileServer(box), gziphandler.GzipHandler, optionalAuthHandler, postInstallHandler))
w.handlerBeta = withMiddlewares(http.FileServer(boxBeta), gziphandler.GzipHandler, optionalAuthHandler, postInstallHandler) </s> remove err := web.httpServer.ListenAndServe()
</s> add err := <-errs | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | internal/home/web.go |
<mask> for !web.httpsServer.shutdown {
<mask> printHTTPAddresses("http")
<mask>
<mask> // we need to have new instance, because after Shutdown() the Server is not usable
<mask> address := net.JoinHostPort(web.conf.BindHost, strconv.Itoa(web.conf.BindPort))
<mask> web.httpServer = &http.Server{
<mask> ErrorLog: log.StdLog("web: http", log.DEBUG),
<mask> Addr: address,
<mask> Handler: withMiddlewares(Context.mux, limitRequestBody),
<mask> ReadTimeout: web.conf.ReadTimeout,
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove Addr: address,
</s> add Addr: net.JoinHostPort(web.conf.BindHost, strconv.Itoa(web.conf.BindPort)), </s> remove err := web.httpServer.ListenAndServe()
</s> add err := <-errs </s> remove Context.mux.Handle("/", postInstallHandler(optionalAuthHandler(gziphandler.GzipHandler(http.FileServer(box)))))
</s> add Context.mux.Handle("/", withMiddlewares(http.FileServer(box), gziphandler.GzipHandler, optionalAuthHandler, postInstallHandler))
w.handlerBeta = withMiddlewares(http.FileServer(boxBeta), gziphandler.GzipHandler, optionalAuthHandler, postInstallHandler) </s> remove address = net.JoinHostPort(config.BindHost, port)
log.Printf("Go to %s://%s", proto, address)
</s> add log.Printf("Go to %s://%s", proto, net.JoinHostPort(config.BindHost, port))
if config.BetaBindPort != 0 {
log.Printf("Go to %s://%s (BETA)", proto, net.JoinHostPort(config.BindHost, strconv.Itoa(config.BetaBindPort)))
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | internal/home/web.go |
|
Addr: net.JoinHostPort(web.conf.BindHost, strconv.Itoa(web.conf.BindPort)), | <mask> // we need to have new instance, because after Shutdown() the Server is not usable
<mask> address := net.JoinHostPort(web.conf.BindHost, strconv.Itoa(web.conf.BindPort))
<mask> web.httpServer = &http.Server{
<mask> ErrorLog: log.StdLog("web: http", log.DEBUG),
<mask> Addr: address,
<mask> Handler: withMiddlewares(Context.mux, limitRequestBody),
<mask> ReadTimeout: web.conf.ReadTimeout,
<mask> ReadHeaderTimeout: web.conf.ReadHeaderTimeout,
<mask> WriteTimeout: web.conf.WriteTimeout,
<mask> }
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove address := net.JoinHostPort(web.conf.BindHost, strconv.Itoa(web.conf.BindPort))
</s> add </s> remove err := web.httpServer.ListenAndServe()
</s> add err := <-errs </s> remove firstRun: Context.firstRun,
BindHost: config.BindHost,
BindPort: config.BindPort,
</s> add firstRun: Context.firstRun,
BindHost: config.BindHost,
BindPort: config.BindPort,
BetaBindPort: config.BetaBindPort, </s> remove Context.mux.Handle("/", postInstallHandler(optionalAuthHandler(gziphandler.GzipHandler(http.FileServer(box)))))
</s> add Context.mux.Handle("/", withMiddlewares(http.FileServer(box), gziphandler.GzipHandler, optionalAuthHandler, postInstallHandler))
w.handlerBeta = withMiddlewares(http.FileServer(boxBeta), gziphandler.GzipHandler, optionalAuthHandler, postInstallHandler) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | internal/home/web.go |
err := <-errs | <mask> ReadHeaderTimeout: web.conf.ReadHeaderTimeout,
<mask> WriteTimeout: web.conf.WriteTimeout,
<mask> }
<mask>
<mask> err := web.httpServer.ListenAndServe()
<mask> if err != http.ErrServerClosed {
<mask> cleanupAlways()
<mask> log.Fatal(err)
<mask> }
<mask> // We use ErrServerClosed as a sign that we need to rebind on new address, so go back to the start of the loop
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove Addr: address,
</s> add Addr: net.JoinHostPort(web.conf.BindHost, strconv.Itoa(web.conf.BindPort)), </s> remove address = net.JoinHostPort(config.BindHost, port)
log.Printf("Go to %s://%s", proto, address)
</s> add log.Printf("Go to %s://%s", proto, net.JoinHostPort(config.BindHost, port))
if config.BetaBindPort != 0 {
log.Printf("Go to %s://%s (BETA)", proto, net.JoinHostPort(config.BindHost, strconv.Itoa(config.BetaBindPort)))
} </s> remove if reqData.Web.Port != 0 && reqData.Web.Port != config.BindPort {
</s> add if reqData.Web.Port != 0 && reqData.Web.Port != config.BindPort && reqData.Web.Port != config.BetaBindPort { </s> remove address := net.JoinHostPort(web.conf.BindHost, strconv.Itoa(web.conf.BindPort))
</s> add </s> remove var address string
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | internal/home/web.go |
if web.httpServerBeta != nil {
_ = web.httpServerBeta.Shutdown(context.TODO())
} | <mask> _ = web.httpServer.Shutdown(context.TODO())
<mask> }
<mask>
<mask> log.Info("Stopped HTTP server")
<mask> }
<mask>
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove _ = Context.web.httpServer.Shutdown(context.TODO())
</s> add _ = web.httpServer.Shutdown(context.TODO())
}()
go func() {
_ = web.httpServerBeta.Shutdown(context.TODO()) </s> remove portHTTPS int
</s> add </s> remove address = net.JoinHostPort(config.BindHost, port)
log.Printf("Go to %s://%s", proto, address)
</s> add log.Printf("Go to %s://%s", proto, net.JoinHostPort(config.BindHost, port))
if config.BetaBindPort != 0 {
log.Printf("Go to %s://%s (BETA)", proto, net.JoinHostPort(config.BindHost, strconv.Itoa(config.BetaBindPort)))
} </s> remove address = net.JoinHostPort(addr, strconv.Itoa(config.BindPort))
log.Printf("Go to %s://%s", proto, address)
</s> add log.Printf("Go to %s://%s", proto, net.JoinHostPort(addr, strconv.Itoa(config.BindPort)))
if config.BetaBindPort != 0 {
log.Printf("Go to %s://%s (BETA)", proto, net.JoinHostPort(addr, strconv.Itoa(config.BetaBindPort)))
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | internal/home/web.go |
'schema':
'$ref': '#/components/schemas/UpstreamsConfigResponse' | <mask> Status of testing each requested server, with "OK" meaning that
<mask> server works, any other text means an error.
<mask> 'content':
<mask> 'application/json':
<mask> 'examples':
<mask> 'response':
<mask> 'value':
<mask> '1.1.1.1': 'OK'
<mask> '1.0.0.1': 'OK'
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove BindHost string `yaml:"bind_host"` // BindHost is the IP address of the HTTP server to bind to
BindPort int `yaml:"bind_port"` // BindPort is the port the HTTP server
Users []User `yaml:"users"` // Users that can access HTTP server
ProxyURL string `yaml:"http_proxy"` // Proxy address for our HTTP client
Language string `yaml:"language"` // two-letter ISO 639-1 language code
RlimitNoFile uint `yaml:"rlimit_nofile"` // Maximum number of opened fd's per process (0: default)
DebugPProf bool `yaml:"debug_pprof"` // Enable pprof HTTP server on port 6060
</s> add BindHost string `yaml:"bind_host"` // BindHost is the IP address of the HTTP server to bind to
BindPort int `yaml:"bind_port"` // BindPort is the port the HTTP server
BetaBindPort int `yaml:"beta_bind_port"` // BetaBindPort is the port for new client
Users []User `yaml:"users"` // Users that can access HTTP server
ProxyURL string `yaml:"http_proxy"` // Proxy address for our HTTP client
Language string `yaml:"language"` // two-letter ISO 639-1 language code
RlimitNoFile uint `yaml:"rlimit_nofile"` // Maximum number of opened fd's per process (0: default)
DebugPProf bool `yaml:"debug_pprof"` // Enable pprof HTTP server on port 6060 | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | openapi/openapi.yaml |
'schema':
'type': 'object'
'parameters':
'enabled':
'type': 'boolean' | <mask> 'content':
<mask> 'application/json':
<mask> 'examples':
<mask> 'response':
<mask> 'value':
<mask> 'enabled': false
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | openapi/openapi.yaml |
'schema':
'type': 'object'
'parameters':
'enable':
'type': 'boolean'
'sensitivity':
'type': 'integer' | <mask> '200':
<mask> 'description': 'OK.'
<mask> 'content':
<mask> 'application/json':
<mask> 'examples':
<mask> 'response':
<mask> 'value':
<mask> 'enabled': true
<mask> 'sensitivity': 13
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove 'format': 'int32'
</s> add 'format': 'uint16' | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | openapi/openapi.yaml |
'schema':
'type': 'object'
'parameters':
'enabled':
'type': 'boolean' | <mask> 'description': 'OK.'
<mask> 'content':
<mask> 'application/json':
<mask> 'examples':
<mask> 'response':
<mask> 'value':
<mask> 'enabled': false
<mask> '/clients':
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | openapi/openapi.yaml |
'/install/get_addresses_beta':
'get':
'tags':
- 'install'
'operationId': 'installGetAddressesBeta'
'summary': >
'UNSTABLE!: Gets the network interfaces information.'
'responses':
'200':
'description': 'OK.'
'content':
'application/json':
'schema':
'$ref': '#/components/schemas/AddressesInfoBeta' | <mask> 'examples':
<mask> 'response':
<mask> 'value': 'en'
<mask> '/install/get_addresses':
<mask> 'get':
<mask> 'tags':
<mask> - 'install'
<mask> 'operationId': 'installGetAddresses'
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | openapi/openapi.yaml |
'format': 'uint16' | <mask> 'type': 'string'
<mask> 'example': '127.0.0.1'
<mask> 'dns_port':
<mask> 'type': 'integer'
<mask> 'format': 'int32'
<mask> 'example': 53
<mask> 'minimum': 1
<mask> 'maximum': 65535
<mask> 'protection_enabled':
<mask> 'type': 'boolean'
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove 'format': 'int32'
</s> add 'format': 'uint16' </s> remove 'format': 'int32'
</s> add 'format': 'uint16' </s> remove 'format': 'int32'
</s> add 'format': 'uint16' </s> remove 'gateway_ip':
'type': 'string'
</s> add 'minItems': 1
'example':
- '127.0.0.1'
'port':
'type': 'integer'
'format': 'uint16'
'example': 53 </s> remove 'format': 'int32'
</s> add 'format': 'uint16' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | openapi/openapi.yaml |
'UpstreamsConfigResponse':
'type': 'object'
'description': 'Upstreams configuration response'
'additionalProperties':
'type': 'string' | <mask> - 'tls://1.1.1.1'
<mask> - 'tls://1.0.0.1'
<mask> 'Filter':
<mask> 'type': 'object'
<mask> 'description': 'Filter subscription info'
<mask> 'required':
<mask> - 'enabled'
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | openapi/openapi.yaml |
'format': 'uint16' | <mask> 'example': true
<mask> 'description': 'if true, forces HTTP->HTTPS redirect'
<mask> 'port_https':
<mask> 'type': 'integer'
<mask> 'format': 'int32'
<mask> 'example': 443
<mask> 'description': 'HTTPS port. If 0, HTTPS will be disabled.'
<mask> 'port_dns_over_tls':
<mask> 'type': 'integer'
<mask> 'format': 'int32'
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove 'format': 'int32'
</s> add 'format': 'uint16' </s> remove 'format': 'int32'
</s> add 'format': 'uint16' </s> remove 'format': 'int32'
</s> add 'format': 'uint16' </s> remove 'format': 'int32'
</s> add 'format': 'uint16' </s> remove 'format': 'int32'
</s> add 'format': 'uint16' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | openapi/openapi.yaml |
'format': 'uint16' | <mask> 'example': 443
<mask> 'description': 'HTTPS port. If 0, HTTPS will be disabled.'
<mask> 'port_dns_over_tls':
<mask> 'type': 'integer'
<mask> 'format': 'int32'
<mask> 'example': 853
<mask> 'description': 'DNS-over-TLS port. If 0, DOT will be disabled.'
<mask> 'port_dns_over_quic':
<mask> 'type': 'integer'
<mask> 'format': 'int32'
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove 'format': 'int32'
</s> add 'format': 'uint16' </s> remove 'format': 'int32'
</s> add 'format': 'uint16' </s> remove 'format': 'int32'
</s> add 'format': 'uint16' </s> remove 'format': 'int32'
</s> add 'format': 'uint16' </s> remove 'format': 'int32'
</s> add 'format': 'uint16' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | openapi/openapi.yaml |
'format': 'uint16' | <mask> 'example': 853
<mask> 'description': 'DNS-over-TLS port. If 0, DOT will be disabled.'
<mask> 'port_dns_over_quic':
<mask> 'type': 'integer'
<mask> 'format': 'int32'
<mask> 'example': 784
<mask> 'description': 'DNS-over-QUIC port. If 0, DOQ will be disabled.'
<mask> 'certificate_chain':
<mask> 'type': 'string'
<mask> 'description': 'Base64 string with PEM-encoded certificates chain'
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove 'format': 'int32'
</s> add 'format': 'uint16' </s> remove 'format': 'int32'
</s> add 'format': 'uint16' </s> remove 'format': 'int32'
</s> add 'format': 'uint16' </s> remove 'format': 'int32'
</s> add 'format': 'uint16' </s> remove 'format': 'int32'
</s> add 'format': 'uint16' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | openapi/openapi.yaml |
'required':
- 'flags'
- 'hardware_address'
- 'name'
- 'mtu' | <mask> Set to true if both certificate and private key are correct.
<mask> 'NetInterface':
<mask> 'type': 'object'
<mask> 'description': 'Network interface info'
<mask> 'properties':
<mask> 'flags':
<mask> 'type': 'string'
<mask> 'example': 'up|broadcast|multicast'
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove 'type': 'string'
'example': 'no'
'description': 'Can be: yes, no, error'
</s> add '$ref': '#/components/schemas/CheckConfigStaticIpInfoStatic' </s> remove 'format': 'int32'
</s> add 'format': 'uint16' | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | openapi/openapi.yaml |
'ip_addresses': | <mask> 'example': '52:54:00:11:09:ba'
<mask> 'name':
<mask> 'type': 'string'
<mask> 'example': 'eth0'
<mask> 'ipv4_addresses':
<mask> 'type': 'array'
<mask> 'items':
<mask> 'type': 'string'
<mask> 'ipv6_addresses':
<mask> 'type': 'array'
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove 'ipv6_addresses':
</s> add 'mtu':
'type': 'integer'
'AddressInfoBeta':
'type': 'object'
'description': 'Port information'
'required':
- 'ip'
- 'port'
'properties':
'ip': </s> remove 'gateway_ip':
'type': 'string'
</s> add 'minItems': 1
'example':
- '127.0.0.1'
'port':
'type': 'integer'
'format': 'uint16'
'example': 53 </s> remove 'properties':
'1.2.3.4':
'items':
'$ref': '#/components/schemas/ClientFindSubEntry'
</s> add 'additionalProperties':
'$ref': '#/components/schemas/ClientFindSubEntry'
'example':
'1.2.3.4': 'test' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | openapi/openapi.yaml |
'mtu':
'type': 'integer'
'AddressInfoBeta':
'type': 'object'
'description': 'Port information'
'required':
- 'ip'
- 'port'
'properties':
'ip': | <mask> 'ipv4_addresses':
<mask> 'type': 'array'
<mask> 'items':
<mask> 'type': 'string'
<mask> 'ipv6_addresses':
<mask> 'type': 'array'
<mask> 'items':
<mask> 'type': 'string'
<mask> 'gateway_ip':
<mask> 'type': 'string'
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove 'ipv4_addresses':
</s> add 'ip_addresses': </s> remove 'gateway_ip':
'type': 'string'
</s> add 'minItems': 1
'example':
- '127.0.0.1'
'port':
'type': 'integer'
'format': 'uint16'
'example': 53 </s> remove 'properties':
'1.2.3.4':
'items':
'$ref': '#/components/schemas/ClientFindSubEntry'
</s> add 'additionalProperties':
'$ref': '#/components/schemas/ClientFindSubEntry'
'example':
'1.2.3.4': 'test' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | openapi/openapi.yaml |
'minItems': 1
'example':
- '127.0.0.1'
'port':
'type': 'integer'
'format': 'uint16'
'example': 53 | <mask> 'ipv6_addresses':
<mask> 'type': 'array'
<mask> 'items':
<mask> 'type': 'string'
<mask> 'gateway_ip':
<mask> 'type': 'string'
<mask> 'AddressInfo':
<mask> 'type': 'object'
<mask> 'description': 'Port information'
<mask> 'properties':
<mask> 'ip':
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove 'ipv6_addresses':
</s> add 'mtu':
'type': 'integer'
'AddressInfoBeta':
'type': 'object'
'description': 'Port information'
'required':
- 'ip'
- 'port'
'properties':
'ip': </s> remove 'ipv4_addresses':
</s> add 'ip_addresses': </s> remove 'properties':
'1.2.3.4':
'items':
'$ref': '#/components/schemas/ClientFindSubEntry'
</s> add 'additionalProperties':
'$ref': '#/components/schemas/ClientFindSubEntry'
'example':
'1.2.3.4': 'test' </s> remove 'type': 'string'
'example': 'no'
'description': 'Can be: yes, no, error'
</s> add '$ref': '#/components/schemas/CheckConfigStaticIpInfoStatic' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | openapi/openapi.yaml |
'required':
- 'ip'
- 'port' | <mask> 'example': 53
<mask> 'AddressInfo':
<mask> 'type': 'object'
<mask> 'description': 'Port information'
<mask> 'properties':
<mask> 'ip':
<mask> 'type': 'string'
<mask> 'example': '127.0.0.1'
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove 'gateway_ip':
'type': 'string'
</s> add 'minItems': 1
'example':
- '127.0.0.1'
'port':
'type': 'integer'
'format': 'uint16'
'example': 53 </s> remove 'ipv6_addresses':
</s> add 'mtu':
'type': 'integer'
'AddressInfoBeta':
'type': 'object'
'description': 'Port information'
'required':
- 'ip'
- 'port'
'properties':
'ip': </s> remove 'format': 'int32'
</s> add 'format': 'uint16' </s> remove 'type': 'string'
'example': 'no'
'description': 'Can be: yes, no, error'
</s> add '$ref': '#/components/schemas/CheckConfigStaticIpInfoStatic' </s> remove 'format': 'int32'
</s> add 'format': 'uint16' | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | openapi/openapi.yaml |
'format': 'uint16' | <mask> 'type': 'string'
<mask> 'example': '127.0.0.1'
<mask> 'port':
<mask> 'type': 'integer'
<mask> 'format': 'int32'
<mask> 'example': 53
<mask> 'AddressesInfo':
<mask> 'type': 'object'
<mask> 'description': 'AdGuard Home addresses configuration'
<mask> 'properties':
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove 'format': 'int32'
</s> add 'format': 'uint16' </s> remove 'format': 'int32'
</s> add 'format': 'uint16' </s> remove 'gateway_ip':
'type': 'string'
</s> add 'minItems': 1
'example':
- '127.0.0.1'
'port':
'type': 'integer'
'format': 'uint16'
'example': 53 </s> remove 'format': 'int32'
</s> add 'format': 'uint16' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | openapi/openapi.yaml |
'required':
- 'dns_port'
- 'web_port'
- 'interfaces' | <mask> 'example': 53
<mask> 'AddressesInfo':
<mask> 'type': 'object'
<mask> 'description': 'AdGuard Home addresses configuration'
<mask> 'properties':
<mask> 'dns_port':
<mask> 'type': 'integer'
<mask> 'format': 'uint16'
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove 'format': 'int32'
</s> add 'format': 'uint16' </s> remove 'format': 'int32'
</s> add 'format': 'uint16' </s> remove 'format': 'int32'
</s> add 'format': 'uint16' </s> remove 'format': 'int32'
</s> add 'format': 'uint16' </s> remove 'gateway_ip':
'type': 'string'
</s> add 'minItems': 1
'example':
- '127.0.0.1'
'port':
'type': 'integer'
'format': 'uint16'
'example': 53 | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | openapi/openapi.yaml |
'format': 'uint16' | <mask> 'description': 'AdGuard Home addresses configuration'
<mask> 'properties':
<mask> 'dns_port':
<mask> 'type': 'integer'
<mask> 'format': 'int32'
<mask> 'example': 53
<mask> 'web_port':
<mask> 'type': 'integer'
<mask> 'format': 'int32'
<mask> 'example': 80
</s> Pull request: beta client squashed
Merge in DNS/adguard-home from beta-client-2 to master
Squashed commit of the following:
commit b2640cc49a6c5484d730b534dcf5a8013d7fa478
Merge: 659def862 aef4659e9
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 19:23:09 2020 +0300
Merge branch 'master' into beta-client-2
commit 659def8626467949c35b7a6a0c99ffafb07b4385
Author: Eugene Burkov <[email protected]>
Date: Tue Dec 29 17:25:14 2020 +0300
all: upgrade github actions node version
commit b4b8cf8dd75672e9155da5d111ac66e8f5ba1535
Author: Vladislav Abdulmyanov <[email protected]>
Date: Tue Dec 29 16:57:14 2020 +0300
all: beta client squashed </s> remove 'format': 'int32'
</s> add 'format': 'uint16' </s> remove 'format': 'int32'
</s> add 'format': 'uint16' </s> remove 'format': 'int32'
</s> add 'format': 'uint16' </s> remove 'format': 'int32'
</s> add 'format': 'uint16' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/5e20ac7ed5de861ea5c945d1775f75312d62b69f | openapi/openapi.yaml |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.