docstring_tokens
stringlengths 18
16.9k
| code_tokens
stringlengths 75
1.81M
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|
keep add keep keep keep keep keep keep | <mask>
<mask> // for each dot, hash it and add it to string
<mask> func hostnameToHashParam(host string) (string, map[string]bool) {
<mask> var hashparam bytes.Buffer
<mask> hashes := map[string]bool{}
<mask> tld, icann := publicsuffix.PublicSuffix(host)
<mask> if !icann {
<mask> // private suffixes like cloudfront.net
</s> * SB/PC: limit the number of hashes in request to 4 </s> add nDots := 0
for i := len(curhost) - 1; i >= 0; i-- {
if curhost[i] == '.' {
nDots++
if nDots == 4 {
curhost = curhost[i+1:] // "xxx.a.b.c.d" -> "a.b.c.d"
break
}
}
}
</s> add func TestSafeBrowsingHash(t *testing.T) {
q, hashes := hostnameToHashParam("1.2.3.4.5.6")
assert.Equal(t, "0132d0fa.b5413b4e.5fa067c1.e7f6c011.", q)
assert.Equal(t, 4, len(hashes))
}
| https://github.com/AdguardTeam/AdGuardHome/commit/0ee3505e1f0cc3df78651f2f9cb393c5ff3df26e | dnsfilter/security.go |
keep keep keep add keep keep keep keep keep keep | <mask> // private suffixes like cloudfront.net
<mask> tld = ""
<mask> }
<mask> curhost := host
<mask> for {
<mask> if curhost == "" {
<mask> // we've reached end of string
<mask> break
<mask> }
<mask> if tld != "" && curhost == tld {
</s> * SB/PC: limit the number of hashes in request to 4 </s> add // The maximum is 4 components: "a.b.c.d" </s> add func TestSafeBrowsingHash(t *testing.T) {
q, hashes := hostnameToHashParam("1.2.3.4.5.6")
assert.Equal(t, "0132d0fa.b5413b4e.5fa067c1.e7f6c011.", q)
assert.Equal(t, 4, len(hashes))
}
| https://github.com/AdguardTeam/AdGuardHome/commit/0ee3505e1f0cc3df78651f2f9cb393c5ff3df26e | dnsfilter/security.go |
keep keep keep replace keep keep keep replace keep keep | <mask> "net/http"
<mask> "os"
<mask> "os/signal"
<mask> "path"
<mask> "path/filepath"
<mask> "runtime"
<mask> "strconv"
<mask> "strings"
<mask> "syscall"
<mask> "time"
</s> Get rid of hardcoded binary name </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() | https://github.com/AdguardTeam/AdGuardHome/commit/0fbfa057b1e2e709357fda08caea20fcbc61e9f4 | app.go |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> // VersionString will be set through ldflags, contains current version
<mask> var VersionString = "undefined"
<mask>
<mask> const (
<mask> // We use it to detect the working dir
<mask> executableName = "AdGuardHome"
<mask>
<mask> // Used in config to indicate that syslog or eventlog (win) should be used for logger output
<mask> configSyslog = "syslog"
<mask> )
<mask>
<mask> // main is the entry point
</s> Get rid of hardcoded binary name </s> remove initWorkingDir()
</s> add initWorkingDir(args) </s> add // getConfigFilename returns path to the current config file
func (c *configuration) getConfigFilename() string {
configFile := config.ourConfigFilename
if !filepath.IsAbs(configFile) {
configFile = filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
}
return configFile
}
</s> remove // Most likely we're debugging -- using current working directory in this case
workDir, _ := os.Getwd()
config.ourBinaryDir = workDir
</s> add config.ourBinaryDir = filepath.Dir(exec) </s> remove currentExecutableName := filepath.Base(exec)
currentExecutableName = strings.TrimSuffix(currentExecutableName, path.Ext(currentExecutableName))
if currentExecutableName == executableName {
// Binary build
config.ourBinaryDir = filepath.Dir(exec)
</s> add if args.configFilename != "" {
// If there is a custom config file, use it's directory as our working dir
config.ourBinaryDir = filepath.Dir(args.configFilename) </s> remove func initWorkingDir() {
</s> add func initWorkingDir(args options) { </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() | https://github.com/AdguardTeam/AdGuardHome/commit/0fbfa057b1e2e709357fda08caea20fcbc61e9f4 | app.go |
keep keep keep keep replace keep keep keep keep keep | <mask> config.ourConfigFilename = args.configFilename
<mask> }
<mask>
<mask> // configure working dir and config path
<mask> initWorkingDir()
<mask>
<mask> // configure log level and output
<mask> configureLogger(args)
<mask>
<mask> // print the first message after logger is configured
</s> Get rid of hardcoded binary name </s> add // getConfigFilename returns path to the current config file
func (c *configuration) getConfigFilename() string {
configFile := config.ourConfigFilename
if !filepath.IsAbs(configFile) {
configFile = filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
}
return configFile
}
</s> remove // Most likely we're debugging -- using current working directory in this case
workDir, _ := os.Getwd()
config.ourBinaryDir = workDir
</s> add config.ourBinaryDir = filepath.Dir(exec) </s> remove // We use it to detect the working dir
executableName = "AdGuardHome"
</s> add </s> remove currentExecutableName := filepath.Base(exec)
currentExecutableName = strings.TrimSuffix(currentExecutableName, path.Ext(currentExecutableName))
if currentExecutableName == executableName {
// Binary build
config.ourBinaryDir = filepath.Dir(exec)
</s> add if args.configFilename != "" {
// If there is a custom config file, use it's directory as our working dir
config.ourBinaryDir = filepath.Dir(args.configFilename) </s> remove func initWorkingDir() {
</s> add func initWorkingDir(args options) { </s> remove configfile := config.ourConfigFilename
if !filepath.IsAbs(configfile) {
configfile = filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
}
_, err := os.Stat(configfile)
</s> add configFile := config.getConfigFilename()
_, err := os.Stat(configFile) | https://github.com/AdguardTeam/AdGuardHome/commit/0fbfa057b1e2e709357fda08caea20fcbc61e9f4 | app.go |
keep keep keep keep replace keep keep keep keep keep | <mask> log.Fatal(http.ListenAndServe(address, nil))
<mask> }
<mask>
<mask> // initWorkingDir initializes the ourBinaryDir (basically, we use it as a working dir)
<mask> func initWorkingDir() {
<mask> exec, err := os.Executable()
<mask> if err != nil {
<mask> panic(err)
<mask> }
<mask>
</s> Get rid of hardcoded binary name </s> remove currentExecutableName := filepath.Base(exec)
currentExecutableName = strings.TrimSuffix(currentExecutableName, path.Ext(currentExecutableName))
if currentExecutableName == executableName {
// Binary build
config.ourBinaryDir = filepath.Dir(exec)
</s> add if args.configFilename != "" {
// If there is a custom config file, use it's directory as our working dir
config.ourBinaryDir = filepath.Dir(args.configFilename) </s> remove configfile := config.ourConfigFilename
if !filepath.IsAbs(configfile) {
configfile = filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
}
_, err := os.Stat(configfile)
</s> add configFile := config.getConfigFilename()
_, err := os.Stat(configFile) </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> add // getConfigFilename returns path to the current config file
func (c *configuration) getConfigFilename() string {
configFile := config.ourConfigFilename
if !filepath.IsAbs(configFile) {
configFile = filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
}
return configFile
}
</s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() | https://github.com/AdguardTeam/AdGuardHome/commit/0fbfa057b1e2e709357fda08caea20fcbc61e9f4 | app.go |
keep replace replace replace replace replace keep replace replace replace keep keep | <mask>
<mask> currentExecutableName := filepath.Base(exec)
<mask> currentExecutableName = strings.TrimSuffix(currentExecutableName, path.Ext(currentExecutableName))
<mask> if currentExecutableName == executableName {
<mask> // Binary build
<mask> config.ourBinaryDir = filepath.Dir(exec)
<mask> } else {
<mask> // Most likely we're debugging -- using current working directory in this case
<mask> workDir, _ := os.Getwd()
<mask> config.ourBinaryDir = workDir
<mask> }
<mask> }
</s> Get rid of hardcoded binary name </s> add // getConfigFilename returns path to the current config file
func (c *configuration) getConfigFilename() string {
configFile := config.ourConfigFilename
if !filepath.IsAbs(configFile) {
configFile = filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
}
return configFile
}
</s> remove configfile := config.ourConfigFilename
if !filepath.IsAbs(configfile) {
configfile = filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
}
_, err := os.Stat(configfile)
</s> add configFile := config.getConfigFilename()
_, err := os.Stat(configFile) </s> remove func initWorkingDir() {
</s> add func initWorkingDir(args options) { </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove // We use it to detect the working dir
executableName = "AdGuardHome"
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0fbfa057b1e2e709357fda08caea20fcbc61e9f4 | app.go |
keep keep keep keep replace replace replace replace replace keep keep keep keep keep | <mask> }
<mask> }
<mask>
<mask> func askUsernamePasswordIfPossible() error {
<mask> configfile := config.ourConfigFilename
<mask> if !filepath.IsAbs(configfile) {
<mask> configfile = filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
<mask> }
<mask> _, err := os.Stat(configfile)
<mask> if !os.IsNotExist(err) {
<mask> // do nothing, file exists
<mask> return nil
<mask> }
<mask> if !terminal.IsTerminal(int(os.Stdin.Fd())) {
</s> Get rid of hardcoded binary name </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove func initWorkingDir() {
</s> add func initWorkingDir(args options) { </s> add // getConfigFilename returns path to the current config file
func (c *configuration) getConfigFilename() string {
configFile := config.ourConfigFilename
if !filepath.IsAbs(configFile) {
configFile = filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
}
return configFile
}
</s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove currentExecutableName := filepath.Base(exec)
currentExecutableName = strings.TrimSuffix(currentExecutableName, path.Ext(currentExecutableName))
if currentExecutableName == executableName {
// Binary build
config.ourBinaryDir = filepath.Dir(exec)
</s> add if args.configFilename != "" {
// If there is a custom config file, use it's directory as our working dir
config.ourBinaryDir = filepath.Dir(args.configFilename) | https://github.com/AdguardTeam/AdGuardHome/commit/0fbfa057b1e2e709357fda08caea20fcbc61e9f4 | app.go |
keep keep keep add keep keep keep keep | <mask> },
<mask> SchemaVersion: currentSchemaVersion,
<mask> }
<mask>
<mask> // getLogSettings reads logging settings from the config file.
<mask> // we do it in a separate method in order to configure logger before the actual configuration is parsed and applied.
<mask> func getLogSettings() logSettings {
<mask> l := logSettings{}
</s> Get rid of hardcoded binary name </s> remove initWorkingDir()
</s> add initWorkingDir(args) </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove // We use it to detect the working dir
executableName = "AdGuardHome"
</s> add </s> remove func initWorkingDir() {
</s> add func initWorkingDir(args options) { </s> remove // Most likely we're debugging -- using current working directory in this case
workDir, _ := os.Getwd()
config.ourBinaryDir = workDir
</s> add config.ourBinaryDir = filepath.Dir(exec) </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() | https://github.com/AdguardTeam/AdGuardHome/commit/0fbfa057b1e2e709357fda08caea20fcbc61e9f4 | config.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> // parseConfig loads configuration from the YAML file
<mask> func parseConfig() error {
<mask> configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
<mask> log.Printf("Reading YAML file: %s", configFile)
<mask> yamlFile, err := readConfigFile()
<mask> if err != nil {
<mask> log.Printf("Couldn't read config file: %s", err)
<mask> return err
</s> Get rid of hardcoded binary name </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configfile := config.ourConfigFilename
if !filepath.IsAbs(configfile) {
configfile = filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
}
_, err := os.Stat(configfile)
</s> add configFile := config.getConfigFilename()
_, err := os.Stat(configFile) </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove func initWorkingDir() {
</s> add func initWorkingDir(args options) { | https://github.com/AdguardTeam/AdGuardHome/commit/0fbfa057b1e2e709357fda08caea20fcbc61e9f4 | config.go |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> // readConfigFile reads config file contents if it exists
<mask> func readConfigFile() ([]byte, error) {
<mask> configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
<mask> if _, err := os.Stat(configFile); os.IsNotExist(err) {
<mask> // do nothing, file doesn't exist
<mask> return nil, nil
<mask> }
<mask> return ioutil.ReadFile(configFile)
</s> Get rid of hardcoded binary name </s> remove configfile := config.ourConfigFilename
if !filepath.IsAbs(configfile) {
configfile = filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
}
_, err := os.Stat(configfile)
</s> add configFile := config.getConfigFilename()
_, err := os.Stat(configFile) </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> add // getConfigFilename returns path to the current config file
func (c *configuration) getConfigFilename() string {
configFile := config.ourConfigFilename
if !filepath.IsAbs(configFile) {
configFile = filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
}
return configFile
}
</s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove func initWorkingDir() {
</s> add func initWorkingDir(args options) { </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() | https://github.com/AdguardTeam/AdGuardHome/commit/0fbfa057b1e2e709357fda08caea20fcbc61e9f4 | config.go |
keep keep keep keep replace keep keep keep keep keep | <mask> // Saves configuration to the YAML file and also saves the user filter contents to a file
<mask> func (c *configuration) write() error {
<mask> c.Lock()
<mask> defer c.Unlock()
<mask> configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
<mask> log.Printf("Writing YAML file: %s", configFile)
<mask> yamlText, err := yaml.Marshal(&config)
<mask> if err != nil {
<mask> log.Printf("Couldn't generate YAML file: %s", err)
<mask> return err
</s> Get rid of hardcoded binary name </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> add // getConfigFilename returns path to the current config file
func (c *configuration) getConfigFilename() string {
configFile := config.ourConfigFilename
if !filepath.IsAbs(configFile) {
configFile = filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
}
return configFile
}
</s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configfile := config.ourConfigFilename
if !filepath.IsAbs(configfile) {
configfile = filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
}
_, err := os.Stat(configfile)
</s> add configFile := config.getConfigFilename()
_, err := os.Stat(configFile) | https://github.com/AdguardTeam/AdGuardHome/commit/0fbfa057b1e2e709357fda08caea20fcbc61e9f4 | config.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> // Performs necessary upgrade operations if needed
<mask> func upgradeConfig() error {
<mask> // read a config file into an interface map, so we can manipulate values without losing any
<mask> configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
<mask> if _, err := os.Stat(configFile); os.IsNotExist(err) {
<mask> log.Printf("config file %s does not exist, nothing to upgrade", configFile)
<mask> return nil
<mask> }
<mask> diskConfig := map[string]interface{}{}
</s> Get rid of hardcoded binary name </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configfile := config.ourConfigFilename
if !filepath.IsAbs(configfile) {
configfile = filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
}
_, err := os.Stat(configfile)
</s> add configFile := config.getConfigFilename()
_, err := os.Stat(configFile) </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove func initWorkingDir() {
</s> add func initWorkingDir(args options) { </s> add // getConfigFilename returns path to the current config file
func (c *configuration) getConfigFilename() string {
configFile := config.ourConfigFilename
if !filepath.IsAbs(configFile) {
configFile = filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
}
return configFile
}
| https://github.com/AdguardTeam/AdGuardHome/commit/0fbfa057b1e2e709357fda08caea20fcbc61e9f4 | upgrade.go |
keep keep keep keep replace keep keep keep keep keep | <mask> log.Println(err)
<mask> return err
<mask> }
<mask>
<mask> configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
<mask> body, err := yaml.Marshal(diskConfig)
<mask> if err != nil {
<mask> log.Printf("Couldn't generate YAML file: %s", err)
<mask> return err
<mask> }
</s> Get rid of hardcoded binary name </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove configfile := config.ourConfigFilename
if !filepath.IsAbs(configfile) {
configfile = filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
}
_, err := os.Stat(configfile)
</s> add configFile := config.getConfigFilename()
_, err := os.Stat(configFile) </s> remove func initWorkingDir() {
</s> add func initWorkingDir(args options) { </s> remove configFile := filepath.Join(config.ourBinaryDir, config.ourConfigFilename)
</s> add configFile := config.getConfigFilename() </s> remove currentExecutableName := filepath.Base(exec)
currentExecutableName = strings.TrimSuffix(currentExecutableName, path.Ext(currentExecutableName))
if currentExecutableName == executableName {
// Binary build
config.ourBinaryDir = filepath.Dir(exec)
</s> add if args.configFilename != "" {
// If there is a custom config file, use it's directory as our working dir
config.ourBinaryDir = filepath.Dir(args.configFilename) | https://github.com/AdguardTeam/AdGuardHome/commit/0fbfa057b1e2e709357fda08caea20fcbc61e9f4 | upgrade.go |
keep keep replace replace keep keep keep keep keep | <mask> {
<mask> "client_settings": "Client settings",
<mask> "example_upstream_reserved": "you can specify DNS upstream <0>for a specific domain(s)</0>",
<mask> "upstream_parallel": "Use parallel queries to speed up resolving by simultaneously querying all upstream servers",
<mask> "bootstrap_dns": "Bootstrap DNS servers",
<mask> "bootstrap_dns_desc": "Bootstrap DNS servers are used to resolve IP addresses of the DoH/DoT resolvers you specify as upstreams.",
<mask> "check_dhcp_servers": "Check for DHCP servers",
<mask> "save_config": "Save config",
<mask> "enabled_dhcp": "DHCP server enabled",
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> add "fastest_addr": "Fastest IP address",
"fastest_addr_desc": "Query all DNS servers and return the fastest IP address among all responses", </s> remove [actions.handleUpstreamChange]: (state, { payload }) => {
const { upstreamDns } = payload;
return { ...state, upstreamDns };
},
</s> add </s> remove setUpstream(url) {
const { path, method } = this.GLOBAL_SET_UPSTREAM_DNS;
const config = {
data: url,
headers: { 'Content-Type': 'application/json' },
};
return this.makeRequest(path, method, config);
}
</s> add </s> remove import { handleUpstreamChange, setUpstream, testUpstream, getDnsSettings } from '../actions';
</s> add import { testUpstream } from '../actions'; </s> remove this.props.getDnsSettings();
</s> add </s> remove GLOBAL_SET_UPSTREAM_DNS = { path: 'set_upstreams_config', method: 'POST' };
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/__locales/en.json |
keep keep keep add keep keep keep keep | <mask> "example_rewrite_domain": "rewrite responses for this domain name only.",
<mask> "example_rewrite_wildcard": "rewrite responses for all <0>example.org</0> subdomains.",
<mask> "disable_ipv6": "Disable IPv6",
<mask> "disable_ipv6_desc": "If this feature is enabled, all DNS queries for IPv6 addresses (type AAAA) will be dropped.",
<mask> "autofix_warning_text": "If you click \"Fix\", AdGuard Home will configure your system to use AdGuard Home DNS server.",
<mask> "autofix_warning_list": "It will perform these tasks: <0>Deactivate system DNSStubListener</0> <0>Set DNS server address to 127.0.0.1</0> <0>Replace symbolic link target of /etc/resolv.conf with /run/systemd/resolve/resolv.conf</0> <0>Stop DNSStubListener (reload systemd-resolved service)</0>",
<mask> "autofix_warning_result": "As a result all DNS requests from your system will be processed by AdGuard Home by default.",
<mask> "tags_title": "Tags",
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove "example_upstream_reserved": "you can specify DNS upstream <0>for a specific domain(s)</0>",
"upstream_parallel": "Use parallel queries to speed up resolving by simultaneously querying all upstream servers",
</s> add "example_upstream_reserved": "You can specify DNS upstream <0>for the specific domain(s)</0>",
"upstream_parallel": "Use parallel requests to speed up resolving by simultaneously querying all upstream servers",
"parallel_requests": "Parallel requests", </s> remove import { renderSelectField } from '../../../../helpers/form';
</s> add </s> remove import { handleUpstreamChange, setUpstream, testUpstream, getDnsSettings } from '../actions';
</s> add import { testUpstream } from '../actions'; </s> add import { normalizeTextarea } from '../helpers/helpers'; </s> remove this.props.getDnsSettings();
</s> add </s> remove this.props.setUpstream(values);
</s> add this.props.setDnsConfig(values); | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/__locales/en.json |
keep keep keep add keep keep keep keep keep | <mask> import { createAction } from 'redux-actions';
<mask>
<mask> import apiClient from '../api/Api';
<mask> import { addErrorToast, addSuccessToast } from './index';
<mask>
<mask> export const getDnsConfigRequest = createAction('GET_DNS_CONFIG_REQUEST');
<mask> export const getDnsConfigFailure = createAction('GET_DNS_CONFIG_FAILURE');
<mask> export const getDnsConfigSuccess = createAction('GET_DNS_CONFIG_SUCCESS');
<mask>
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove import { renderSelectField } from '../../../../helpers/form';
</s> add </s> remove import { handleUpstreamChange, setUpstream, testUpstream, getDnsSettings } from '../actions';
</s> add import { testUpstream } from '../actions'; </s> remove this.props.getDnsSettings();
</s> add </s> remove this.props.setUpstream(values);
</s> add this.props.setDnsConfig(values); </s> remove export const getDnsSettingsRequest = createAction('GET_DNS_SETTINGS_REQUEST');
export const getDnsSettingsFailure = createAction('GET_DNS_SETTINGS_FAILURE');
export const getDnsSettingsSuccess = createAction('GET_DNS_SETTINGS_SUCCESS');
export const getDnsSettings = () => async (dispatch) => {
dispatch(getDnsSettingsRequest());
try {
const dnsStatus = await apiClient.getGlobalStatus();
dispatch(getDnsSettingsSuccess(dnsStatus));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(getDnsSettingsFailure());
}
};
export const handleUpstreamChange = createAction('HANDLE_UPSTREAM_CHANGE');
export const setUpstreamRequest = createAction('SET_UPSTREAM_REQUEST');
export const setUpstreamFailure = createAction('SET_UPSTREAM_FAILURE');
export const setUpstreamSuccess = createAction('SET_UPSTREAM_SUCCESS');
export const setUpstream = config => async (dispatch) => {
dispatch(setUpstreamRequest());
try {
const values = { ...config };
values.bootstrap_dns = normalizeTextarea(values.bootstrap_dns);
values.upstream_dns = normalizeTextarea(values.upstream_dns);
await apiClient.setUpstream(values);
dispatch(addSuccessToast('updated_upstream_dns_toast'));
dispatch(setUpstreamSuccess(config));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setUpstreamFailure());
}
};
</s> add </s> remove const getFields = (processing, t) => Object.values(BLOCKING_MODES).map(mode => (
<Field
key={mode}
name="blocking_mode"
type="radio"
component={renderRadioField}
value={mode}
placeholder={t(mode)}
disabled={processing}
/>
));
</s> add const checkboxes = [{
name: 'edns_cs_enabled',
placeholder: 'edns_enable',
subtitle: 'edns_cs_desc',
},
{
name: 'dnssec_enabled',
placeholder: 'dnssec_enable',
subtitle: 'dnssec_enable_desc',
},
{
name: 'disable_ipv6',
placeholder: 'disable_ipv6',
subtitle: 'disable_ipv6_desc',
}];
const customIps = [{
description: 'blocking_ipv4_desc',
name: 'blocking_ipv4',
validateIp: ipv4,
},
{
description: 'blocking_ipv6_desc',
name: 'blocking_ipv6',
validateIp: ipv6,
}];
const getFields = (processing, t) => Object.values(BLOCKING_MODES)
.map(mode => (
<Field
key={mode}
name="blocking_mode"
type="radio"
component={renderRadioField}
value={mode}
placeholder={t(mode)}
disabled={processing}
/>
)); | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/actions/dnsConfig.js |
keep keep keep keep replace replace keep keep keep keep keep | <mask>
<mask> export const setDnsConfig = config => async (dispatch) => {
<mask> dispatch(setDnsConfigRequest());
<mask> try {
<mask> await apiClient.setDnsConfig(config);
<mask> dispatch(addSuccessToast('config_successfully_saved'));
<mask> dispatch(setDnsConfigSuccess(config));
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(setDnsConfigFailure());
<mask> }
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove export const getDnsSettingsRequest = createAction('GET_DNS_SETTINGS_REQUEST');
export const getDnsSettingsFailure = createAction('GET_DNS_SETTINGS_FAILURE');
export const getDnsSettingsSuccess = createAction('GET_DNS_SETTINGS_SUCCESS');
export const getDnsSettings = () => async (dispatch) => {
dispatch(getDnsSettingsRequest());
try {
const dnsStatus = await apiClient.getGlobalStatus();
dispatch(getDnsSettingsSuccess(dnsStatus));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(getDnsSettingsFailure());
}
};
export const handleUpstreamChange = createAction('HANDLE_UPSTREAM_CHANGE');
export const setUpstreamRequest = createAction('SET_UPSTREAM_REQUEST');
export const setUpstreamFailure = createAction('SET_UPSTREAM_FAILURE');
export const setUpstreamSuccess = createAction('SET_UPSTREAM_SUCCESS');
export const setUpstream = config => async (dispatch) => {
dispatch(setUpstreamRequest());
try {
const values = { ...config };
values.bootstrap_dns = normalizeTextarea(values.bootstrap_dns);
values.upstream_dns = normalizeTextarea(values.upstream_dns);
await apiClient.setUpstream(values);
dispatch(addSuccessToast('updated_upstream_dns_toast'));
dispatch(setUpstreamSuccess(config));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setUpstreamFailure());
}
};
</s> add </s> add onClick, </s> remove setUpstream(url) {
const { path, method } = this.GLOBAL_SET_UPSTREAM_DNS;
const config = {
data: url,
headers: { 'Content-Type': 'application/json' },
};
return this.makeRequest(path, method, config);
}
</s> add </s> add import { normalizeTextarea } from '../helpers/helpers'; </s> remove [actions.handleUpstreamChange]: (state, { payload }) => {
const { upstreamDns } = payload;
return { ...state, upstreamDns };
},
</s> add </s> remove [actions.getDnsSettingsRequest]: state => ({ ...state, processingDnsSettings: true }),
[actions.getDnsSettingsFailure]: state => ({ ...state, processingDnsSettings: false }),
[actions.getDnsSettingsSuccess]: (state, { payload }) => {
const {
upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
} = payload;
return {
...state,
allServers,
upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
processingDnsSettings: false,
};
},
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/actions/dnsConfig.js |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> handleRequestError(error);
<mask> }
<mask> };
<mask>
<mask> export const getDnsSettingsRequest = createAction('GET_DNS_SETTINGS_REQUEST');
<mask> export const getDnsSettingsFailure = createAction('GET_DNS_SETTINGS_FAILURE');
<mask> export const getDnsSettingsSuccess = createAction('GET_DNS_SETTINGS_SUCCESS');
<mask>
<mask> export const getDnsSettings = () => async (dispatch) => {
<mask> dispatch(getDnsSettingsRequest());
<mask> try {
<mask> const dnsStatus = await apiClient.getGlobalStatus();
<mask> dispatch(getDnsSettingsSuccess(dnsStatus));
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(getDnsSettingsFailure());
<mask> }
<mask> };
<mask>
<mask> export const handleUpstreamChange = createAction('HANDLE_UPSTREAM_CHANGE');
<mask> export const setUpstreamRequest = createAction('SET_UPSTREAM_REQUEST');
<mask> export const setUpstreamFailure = createAction('SET_UPSTREAM_FAILURE');
<mask> export const setUpstreamSuccess = createAction('SET_UPSTREAM_SUCCESS');
<mask>
<mask> export const setUpstream = config => async (dispatch) => {
<mask> dispatch(setUpstreamRequest());
<mask> try {
<mask> const values = { ...config };
<mask> values.bootstrap_dns = normalizeTextarea(values.bootstrap_dns);
<mask> values.upstream_dns = normalizeTextarea(values.upstream_dns);
<mask>
<mask> await apiClient.setUpstream(values);
<mask> dispatch(addSuccessToast('updated_upstream_dns_toast'));
<mask> dispatch(setUpstreamSuccess(config));
<mask> } catch (error) {
<mask> dispatch(addErrorToast({ error }));
<mask> dispatch(setUpstreamFailure());
<mask> }
<mask> };
<mask>
<mask> export const testUpstreamRequest = createAction('TEST_UPSTREAM_REQUEST');
<mask> export const testUpstreamFailure = createAction('TEST_UPSTREAM_FAILURE');
<mask> export const testUpstreamSuccess = createAction('TEST_UPSTREAM_SUCCESS');
<mask>
<mask> export const testUpstream = config => async (dispatch) => {
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove await apiClient.setDnsConfig(config);
dispatch(addSuccessToast('config_successfully_saved'));
</s> add const data = { ...config };
let hasDnsSettings = false;
if (Object.prototype.hasOwnProperty.call(data, 'bootstrap_dns')) {
data.bootstrap_dns = normalizeTextarea(config.bootstrap_dns);
hasDnsSettings = true;
}
if (Object.prototype.hasOwnProperty.call(data, 'upstream_dns')) {
data.upstream_dns = normalizeTextarea(config.upstream_dns);
hasDnsSettings = true;
}
await apiClient.setDnsConfig(data);
if (hasDnsSettings) {
dispatch(addSuccessToast('updated_upstream_dns_toast'));
} else {
dispatch(addSuccessToast('config_successfully_saved'));
}
</s> add import { normalizeTextarea } from '../helpers/helpers'; </s> remove upstreamDns,
bootstrapDns,
allServers,
</s> add upstream_dns,
bootstrap_dns,
fastest_addr,
parallel_requests, </s> remove getDnsSettings,
</s> add </s> add dnsConfig: PropTypes.object.isRequired,
setDnsConfig: PropTypes.func.isRequired, </s> remove processingSetUpstream: PropTypes.bool.isRequired,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/actions/index.js |
keep keep keep keep replace keep keep keep keep keep | <mask> }
<mask>
<mask> // Global methods
<mask> GLOBAL_STATUS = { path: 'status', method: 'GET' };
<mask> GLOBAL_SET_UPSTREAM_DNS = { path: 'set_upstreams_config', method: 'POST' };
<mask> GLOBAL_TEST_UPSTREAM_DNS = { path: 'test_upstream_dns', method: 'POST' };
<mask> GLOBAL_VERSION = { path: 'version.json', method: 'POST' };
<mask> GLOBAL_UPDATE = { path: 'update', method: 'POST' };
<mask>
<mask> getGlobalStatus() {
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove [actions.handleUpstreamChange]: (state, { payload }) => {
const { upstreamDns } = payload;
return { ...state, upstreamDns };
},
</s> add </s> remove this.props.setUpstream(values);
</s> add this.props.setDnsConfig(values); </s> remove handleUpstreamChange,
setUpstream,
</s> add </s> remove export const getDnsSettingsRequest = createAction('GET_DNS_SETTINGS_REQUEST');
export const getDnsSettingsFailure = createAction('GET_DNS_SETTINGS_FAILURE');
export const getDnsSettingsSuccess = createAction('GET_DNS_SETTINGS_SUCCESS');
export const getDnsSettings = () => async (dispatch) => {
dispatch(getDnsSettingsRequest());
try {
const dnsStatus = await apiClient.getGlobalStatus();
dispatch(getDnsSettingsSuccess(dnsStatus));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(getDnsSettingsFailure());
}
};
export const handleUpstreamChange = createAction('HANDLE_UPSTREAM_CHANGE');
export const setUpstreamRequest = createAction('SET_UPSTREAM_REQUEST');
export const setUpstreamFailure = createAction('SET_UPSTREAM_FAILURE');
export const setUpstreamSuccess = createAction('SET_UPSTREAM_SUCCESS');
export const setUpstream = config => async (dispatch) => {
dispatch(setUpstreamRequest());
try {
const values = { ...config };
values.bootstrap_dns = normalizeTextarea(values.bootstrap_dns);
values.upstream_dns = normalizeTextarea(values.upstream_dns);
await apiClient.setUpstream(values);
dispatch(addSuccessToast('updated_upstream_dns_toast'));
dispatch(setUpstreamSuccess(config));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setUpstreamFailure());
}
};
</s> add </s> remove [actions.setUpstreamRequest]: state => ({ ...state, processingSetUpstream: true }),
[actions.setUpstreamFailure]: state => ({ ...state, processingSetUpstream: false }),
[actions.setUpstreamSuccess]: (state, { payload }) => ({
...state,
...payload,
processingSetUpstream: false,
}),
</s> add </s> add dnsConfig: PropTypes.object.isRequired,
setDnsConfig: PropTypes.func.isRequired, | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/api/Api.js |
keep keep keep keep replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> const { path, method } = this.GLOBAL_STATUS;
<mask> return this.makeRequest(path, method);
<mask> }
<mask>
<mask> setUpstream(url) {
<mask> const { path, method } = this.GLOBAL_SET_UPSTREAM_DNS;
<mask> const config = {
<mask> data: url,
<mask> headers: { 'Content-Type': 'application/json' },
<mask> };
<mask> return this.makeRequest(path, method, config);
<mask> }
<mask>
<mask> testUpstream(servers) {
<mask> const { path, method } = this.GLOBAL_TEST_UPSTREAM_DNS;
<mask> const config = {
<mask> data: servers,
<mask> headers: { 'Content-Type': 'application/json' },
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove [actions.handleUpstreamChange]: (state, { payload }) => {
const { upstreamDns } = payload;
return { ...state, upstreamDns };
},
</s> add </s> remove export const getDnsSettingsRequest = createAction('GET_DNS_SETTINGS_REQUEST');
export const getDnsSettingsFailure = createAction('GET_DNS_SETTINGS_FAILURE');
export const getDnsSettingsSuccess = createAction('GET_DNS_SETTINGS_SUCCESS');
export const getDnsSettings = () => async (dispatch) => {
dispatch(getDnsSettingsRequest());
try {
const dnsStatus = await apiClient.getGlobalStatus();
dispatch(getDnsSettingsSuccess(dnsStatus));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(getDnsSettingsFailure());
}
};
export const handleUpstreamChange = createAction('HANDLE_UPSTREAM_CHANGE');
export const setUpstreamRequest = createAction('SET_UPSTREAM_REQUEST');
export const setUpstreamFailure = createAction('SET_UPSTREAM_FAILURE');
export const setUpstreamSuccess = createAction('SET_UPSTREAM_SUCCESS');
export const setUpstream = config => async (dispatch) => {
dispatch(setUpstreamRequest());
try {
const values = { ...config };
values.bootstrap_dns = normalizeTextarea(values.bootstrap_dns);
values.upstream_dns = normalizeTextarea(values.upstream_dns);
await apiClient.setUpstream(values);
dispatch(addSuccessToast('updated_upstream_dns_toast'));
dispatch(setUpstreamSuccess(config));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setUpstreamFailure());
}
};
</s> add </s> remove await apiClient.setDnsConfig(config);
dispatch(addSuccessToast('config_successfully_saved'));
</s> add const data = { ...config };
let hasDnsSettings = false;
if (Object.prototype.hasOwnProperty.call(data, 'bootstrap_dns')) {
data.bootstrap_dns = normalizeTextarea(config.bootstrap_dns);
hasDnsSettings = true;
}
if (Object.prototype.hasOwnProperty.call(data, 'upstream_dns')) {
data.upstream_dns = normalizeTextarea(config.upstream_dns);
hasDnsSettings = true;
}
await apiClient.setDnsConfig(data);
if (hasDnsSettings) {
dispatch(addSuccessToast('updated_upstream_dns_toast'));
} else {
dispatch(addSuccessToast('config_successfully_saved'));
}
</s> add upstream_dns,
bootstrap_dns, </s> add dnsConfig: {
upstream_dns,
bootstrap_dns,
fastest_addr,
parallel_requests,
processingSetConfig,
}, </s> remove [actions.getDnsSettingsRequest]: state => ({ ...state, processingDnsSettings: true }),
[actions.getDnsSettingsFailure]: state => ({ ...state, processingDnsSettings: false }),
[actions.getDnsSettingsSuccess]: (state, { payload }) => {
const {
upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
} = payload;
return {
...state,
allServers,
upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
processingDnsSettings: false,
};
},
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/api/Api.js |
keep replace replace replace replace replace replace replace replace replace replace replace keep keep keep replace keep keep | <mask>
<mask> const getFields = (processing, t) => Object.values(BLOCKING_MODES).map(mode => (
<mask> <Field
<mask> key={mode}
<mask> name="blocking_mode"
<mask> type="radio"
<mask> component={renderRadioField}
<mask> value={mode}
<mask> placeholder={t(mode)}
<mask> disabled={processing}
<mask> />
<mask> ));
<mask>
<mask> let Form = ({
<mask> handleSubmit, submitting, invalid, processing, blockingMode, t,
<mask> }) => (
<mask> <form onSubmit={handleSubmit}>
<mask> <div className="row">
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> add const INPUT_FIELDS = getInputFields(parallel_requests, fastest_addr);
</s> remove <div className="col-12">
<div className="form__group form__group--settings">
<label className="form__label" htmlFor="upstream_dns">
<Trans>upstream_dns</Trans>
</label>
<Field
id="upstream_dns"
name="upstream_dns"
component="textarea"
type="text"
className="form-control form-control--textarea"
placeholder={t('upstream_dns')}
disabled={processingSetUpstream || processingTestUpstream}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="all_servers"
type="checkbox"
component={renderSelectField}
placeholder={t('upstream_parallel')}
disabled={processingSetUpstream}
/>
</div>
</div>
</s> add {INPUT_FIELDS.map(({
name, component, type, className, placeholder, getTitle, subtitle, disabled,
}) => <div className="col-12 mb-4" key={name}>
{typeof getTitle === 'function' && getTitle()}
<Field
id={name}
name={name}
component={component}
type={type}
className={className}
placeholder={t(placeholder)}
subtitle={t(subtitle)}
disabled={processingSetConfig || processingTestUpstream || disabled}
/>
</div>)} </s> remove <div className="col-12">
<div className="form__group form__group--settings">
<Field
name="edns_cs_enabled"
type="checkbox"
component={renderSelectField}
placeholder={t('edns_enable')}
disabled={processing}
subtitle={t('edns_cs_desc')}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="dnssec_enabled"
type="checkbox"
component={renderSelectField}
placeholder={t('dnssec_enable')}
disabled={processing}
subtitle={t('dnssec_enable_desc')}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="disable_ipv6"
type="checkbox"
component={renderSelectField}
placeholder={t('disable_ipv6')}
disabled={processing}
subtitle={t('disable_ipv6_desc')}
/>
</div>
</div>
</s> add {checkboxes.map(({ name, placeholder, subtitle }) =>
<div className="col-12" key={name}>
<div className="form__group form__group--settings">
<Field
name={name}
type="checkbox"
component={renderSelectField}
placeholder={t(placeholder)}
disabled={processing}
subtitle={t(subtitle)}
/>
</div>
</div>)} </s> remove upstreamDns,
bootstrapDns,
allServers,
</s> add </s> remove <label htmlFor="ratelimit" className="form__label form__label--with-desc">
</s> add <label htmlFor="ratelimit"
className="form__label form__label--with-desc"> | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Config/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> <form onSubmit={handleSubmit}>
<mask> <div className="row">
<mask> <div className="col-12 col-sm-6">
<mask> <div className="form__group form__group--settings">
<mask> <label htmlFor="ratelimit" className="form__label form__label--with-desc">
<mask> <Trans>rate_limit</Trans>
<mask> </label>
<mask> <div className="form__desc form__desc--top">
<mask> <Trans>rate_limit_desc</Trans>
<mask> </div>
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove <label htmlFor="ip_address" className="form__label form__label--with-desc">
<Trans>blocking_ipv6</Trans>
</s> add <label className="form__label form__label--with-desc"
htmlFor={name}><Trans>{name}</Trans> </s> remove <div className="col-12 col-sm-6">
<div className="form__group form__group--settings">
<label htmlFor="blocking_ipv4" className="form__label form__label--with-desc">
<Trans>blocking_ipv4</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>blocking_ipv4_desc</Trans>
</div>
<Field
name="blocking_ipv4"
component={renderInputField}
className="form-control"
placeholder={t('form_enter_ip')}
validate={[ipv4, required]}
/>
</div>
</div>
<div className="col-12 col-sm-6">
</s> add {customIps.map(({
description,
name,
validateIp,
}) => <div className="col-12 col-sm-6" key={name}> </s> remove }) => (
</s> add }) => </s> remove <div className="col-12">
<div className="form__group">
<label
className="form__label form__label--with-desc"
htmlFor="bootstrap_dns"
>
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans>
</div>
<Field
id="bootstrap_dns"
name="bootstrap_dns"
component="textarea"
type="text"
className="form-control form-control--textarea form-control--textarea-small"
placeholder={t('bootstrap_dns')}
disabled={processingSetUpstream}
/>
</s> add <div className="col-12 mb-4">
<label
className="form__label form__label--with-desc"
htmlFor="bootstrap_dns"
>
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans> </s> remove <div className="col-12">
<div className="form__group form__group--settings">
<Field
name="edns_cs_enabled"
type="checkbox"
component={renderSelectField}
placeholder={t('edns_enable')}
disabled={processing}
subtitle={t('edns_cs_desc')}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="dnssec_enabled"
type="checkbox"
component={renderSelectField}
placeholder={t('dnssec_enable')}
disabled={processing}
subtitle={t('dnssec_enable_desc')}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="disable_ipv6"
type="checkbox"
component={renderSelectField}
placeholder={t('disable_ipv6')}
disabled={processing}
subtitle={t('disable_ipv6_desc')}
/>
</div>
</div>
</s> add {checkboxes.map(({ name, placeholder, subtitle }) =>
<div className="col-12" key={name}>
<div className="form__group form__group--settings">
<Field
name={name}
type="checkbox"
component={renderSelectField}
placeholder={t(placeholder)}
disabled={processing}
subtitle={t(subtitle)}
/>
</div>
</div>)} </s> remove <Trans>blocking_ipv6_desc</Trans>
</s> add <Trans>{description}</Trans> | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Config/Form.js |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> validate={[required, biggerOrEqualZero]}
<mask> />
<mask> </div>
<mask> </div>
<mask> <div className="col-12">
<mask> <div className="form__group form__group--settings">
<mask> <Field
<mask> name="edns_cs_enabled"
<mask> type="checkbox"
<mask> component={renderSelectField}
<mask> placeholder={t('edns_enable')}
<mask> disabled={processing}
<mask> subtitle={t('edns_cs_desc')}
<mask> />
<mask> </div>
<mask> </div>
<mask> <div className="col-12">
<mask> <div className="form__group form__group--settings">
<mask> <Field
<mask> name="dnssec_enabled"
<mask> type="checkbox"
<mask> component={renderSelectField}
<mask> placeholder={t('dnssec_enable')}
<mask> disabled={processing}
<mask> subtitle={t('dnssec_enable_desc')}
<mask> />
<mask> </div>
<mask> </div>
<mask> <div className="col-12">
<mask> <div className="form__group form__group--settings">
<mask> <Field
<mask> name="disable_ipv6"
<mask> type="checkbox"
<mask> component={renderSelectField}
<mask> placeholder={t('disable_ipv6')}
<mask> disabled={processing}
<mask> subtitle={t('disable_ipv6_desc')}
<mask> />
<mask> </div>
<mask> </div>
<mask> <div className="col-12">
<mask> <div className="form__group form__group--settings mb-4">
<mask> <label className="form__label form__label--with-desc">
<mask> <Trans>blocking_mode</Trans>
<mask> </label>
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove <div className="col-12">
<div className="form__group form__group--settings">
<label className="form__label" htmlFor="upstream_dns">
<Trans>upstream_dns</Trans>
</label>
<Field
id="upstream_dns"
name="upstream_dns"
component="textarea"
type="text"
className="form-control form-control--textarea"
placeholder={t('upstream_dns')}
disabled={processingSetUpstream || processingTestUpstream}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="all_servers"
type="checkbox"
component={renderSelectField}
placeholder={t('upstream_parallel')}
disabled={processingSetUpstream}
/>
</div>
</div>
</s> add {INPUT_FIELDS.map(({
name, component, type, className, placeholder, getTitle, subtitle, disabled,
}) => <div className="col-12 mb-4" key={name}>
{typeof getTitle === 'function' && getTitle()}
<Field
id={name}
name={name}
component={component}
type={type}
className={className}
placeholder={t(placeholder)}
subtitle={t(subtitle)}
disabled={processingSetConfig || processingTestUpstream || disabled}
/>
</div>)} </s> remove <label htmlFor="ip_address" className="form__label form__label--with-desc">
<Trans>blocking_ipv6</Trans>
</s> add <label className="form__label form__label--with-desc"
htmlFor={name}><Trans>{name}</Trans> </s> remove <div className="col-12">
<div className="form__group">
<label
className="form__label form__label--with-desc"
htmlFor="bootstrap_dns"
>
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans>
</div>
<Field
id="bootstrap_dns"
name="bootstrap_dns"
component="textarea"
type="text"
className="form-control form-control--textarea form-control--textarea-small"
placeholder={t('bootstrap_dns')}
disabled={processingSetUpstream}
/>
</s> add <div className="col-12 mb-4">
<label
className="form__label form__label--with-desc"
htmlFor="bootstrap_dns"
>
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans> </s> remove <div className="col-12 col-sm-6">
<div className="form__group form__group--settings">
<label htmlFor="blocking_ipv4" className="form__label form__label--with-desc">
<Trans>blocking_ipv4</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>blocking_ipv4_desc</Trans>
</div>
<Field
name="blocking_ipv4"
component={renderInputField}
className="form-control"
placeholder={t('form_enter_ip')}
validate={[ipv4, required]}
/>
</div>
</div>
<div className="col-12 col-sm-6">
</s> add {customIps.map(({
description,
name,
validateIp,
}) => <div className="col-12 col-sm-6" key={name}> </s> remove <label htmlFor="ratelimit" className="form__label form__label--with-desc">
</s> add <label htmlFor="ratelimit"
className="form__label form__label--with-desc"> </s> add <Field
id="bootstrap_dns"
name="bootstrap_dns"
component="textarea"
type="text"
className="form-control form-control--textarea form-control--textarea-small"
placeholder={t('bootstrap_dns')}
disabled={processingSetConfig}
/> | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Config/Form.js |
keep keep keep keep replace replace replace replace replace keep keep keep keep keep | <mask> <label className="form__label form__label--with-desc">
<mask> <Trans>blocking_mode</Trans>
<mask> </label>
<mask> <div className="form__desc form__desc--top">
<mask> {Object.values(BLOCKING_MODES).map(mode => (
<mask> <li key={mode}>
<mask> <Trans >{`blocking_mode_${mode}`}</Trans>
<mask> </li>
<mask> ))}
<mask> </div>
<mask> <div className="custom-controls-stacked">
<mask> {getFields(processing, t)}
<mask> </div>
<mask> </div>
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove <div className="col-12 col-sm-6">
<div className="form__group form__group--settings">
<label htmlFor="blocking_ipv4" className="form__label form__label--with-desc">
<Trans>blocking_ipv4</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>blocking_ipv4_desc</Trans>
</div>
<Field
name="blocking_ipv4"
component={renderInputField}
className="form-control"
placeholder={t('form_enter_ip')}
validate={[ipv4, required]}
/>
</div>
</div>
<div className="col-12 col-sm-6">
</s> add {customIps.map(({
description,
name,
validateIp,
}) => <div className="col-12 col-sm-6" key={name}> </s> remove <label htmlFor="ip_address" className="form__label form__label--with-desc">
<Trans>blocking_ipv6</Trans>
</s> add <label className="form__label form__label--with-desc"
htmlFor={name}><Trans>{name}</Trans> </s> remove <label htmlFor="ratelimit" className="form__label form__label--with-desc">
</s> add <label htmlFor="ratelimit"
className="form__label form__label--with-desc"> </s> remove <Trans>blocking_ipv6_desc</Trans>
</s> add <Trans>{description}</Trans> </s> remove <div className="col-12">
<div className="form__group">
<label
className="form__label form__label--with-desc"
htmlFor="bootstrap_dns"
>
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans>
</div>
<Field
id="bootstrap_dns"
name="bootstrap_dns"
component="textarea"
type="text"
className="form-control form-control--textarea form-control--textarea-small"
placeholder={t('bootstrap_dns')}
disabled={processingSetUpstream}
/>
</s> add <div className="col-12 mb-4">
<label
className="form__label form__label--with-desc"
htmlFor="bootstrap_dns"
>
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans> </s> remove <div className="col-12">
<div className="form__group form__group--settings">
<Field
name="edns_cs_enabled"
type="checkbox"
component={renderSelectField}
placeholder={t('edns_enable')}
disabled={processing}
subtitle={t('edns_cs_desc')}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="dnssec_enabled"
type="checkbox"
component={renderSelectField}
placeholder={t('dnssec_enable')}
disabled={processing}
subtitle={t('dnssec_enable_desc')}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="disable_ipv6"
type="checkbox"
component={renderSelectField}
placeholder={t('disable_ipv6')}
disabled={processing}
subtitle={t('disable_ipv6_desc')}
/>
</div>
</div>
</s> add {checkboxes.map(({ name, placeholder, subtitle }) =>
<div className="col-12" key={name}>
<div className="form__group form__group--settings">
<Field
name={name}
type="checkbox"
component={renderSelectField}
placeholder={t(placeholder)}
disabled={processing}
subtitle={t(subtitle)}
/>
</div>
</div>)} | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Config/Form.js |
keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep replace replace | <mask> </div>
<mask> {blockingMode === BLOCKING_MODES.custom_ip && (
<mask> <Fragment>
<mask> <div className="col-12 col-sm-6">
<mask> <div className="form__group form__group--settings">
<mask> <label htmlFor="blocking_ipv4" className="form__label form__label--with-desc">
<mask> <Trans>blocking_ipv4</Trans>
<mask> </label>
<mask> <div className="form__desc form__desc--top">
<mask> <Trans>blocking_ipv4_desc</Trans>
<mask> </div>
<mask> <Field
<mask> name="blocking_ipv4"
<mask> component={renderInputField}
<mask> className="form-control"
<mask> placeholder={t('form_enter_ip')}
<mask> validate={[ipv4, required]}
<mask> />
<mask> </div>
<mask> </div>
<mask> <div className="col-12 col-sm-6">
<mask> <div className="form__group form__group--settings">
<mask> <label htmlFor="ip_address" className="form__label form__label--with-desc">
<mask> <Trans>blocking_ipv6</Trans>
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove <label htmlFor="ratelimit" className="form__label form__label--with-desc">
</s> add <label htmlFor="ratelimit"
className="form__label form__label--with-desc"> </s> remove <Trans>blocking_ipv6_desc</Trans>
</s> add <Trans>{description}</Trans> </s> remove <div className="col-12">
<div className="form__group form__group--settings">
<Field
name="edns_cs_enabled"
type="checkbox"
component={renderSelectField}
placeholder={t('edns_enable')}
disabled={processing}
subtitle={t('edns_cs_desc')}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="dnssec_enabled"
type="checkbox"
component={renderSelectField}
placeholder={t('dnssec_enable')}
disabled={processing}
subtitle={t('dnssec_enable_desc')}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="disable_ipv6"
type="checkbox"
component={renderSelectField}
placeholder={t('disable_ipv6')}
disabled={processing}
subtitle={t('disable_ipv6_desc')}
/>
</div>
</div>
</s> add {checkboxes.map(({ name, placeholder, subtitle }) =>
<div className="col-12" key={name}>
<div className="form__group form__group--settings">
<Field
name={name}
type="checkbox"
component={renderSelectField}
placeholder={t(placeholder)}
disabled={processing}
subtitle={t(subtitle)}
/>
</div>
</div>)} </s> remove }) => (
</s> add }) => </s> remove <div className="col-12">
<div className="form__group">
<label
className="form__label form__label--with-desc"
htmlFor="bootstrap_dns"
>
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans>
</div>
<Field
id="bootstrap_dns"
name="bootstrap_dns"
component="textarea"
type="text"
className="form-control form-control--textarea form-control--textarea-small"
placeholder={t('bootstrap_dns')}
disabled={processingSetUpstream}
/>
</s> add <div className="col-12 mb-4">
<label
className="form__label form__label--with-desc"
htmlFor="bootstrap_dns"
>
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans> | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Config/Form.js |
keep replace keep keep replace keep keep keep keep | <mask> <div className="form__desc form__desc--top">
<mask> <Trans>blocking_ipv6_desc</Trans>
<mask> </div>
<mask> <Field
<mask> name="blocking_ipv6"
<mask> component={renderInputField}
<mask> className="form-control"
<mask> placeholder={t('form_enter_ip')}
<mask> validate={[ipv6, required]}
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove validate={[ipv6, required]}
</s> add validate={[validateIp, required]} </s> remove <div className="col-12 col-sm-6">
<div className="form__group form__group--settings">
<label htmlFor="blocking_ipv4" className="form__label form__label--with-desc">
<Trans>blocking_ipv4</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>blocking_ipv4_desc</Trans>
</div>
<Field
name="blocking_ipv4"
component={renderInputField}
className="form-control"
placeholder={t('form_enter_ip')}
validate={[ipv4, required]}
/>
</div>
</div>
<div className="col-12 col-sm-6">
</s> add {customIps.map(({
description,
name,
validateIp,
}) => <div className="col-12 col-sm-6" key={name}> </s> remove <label htmlFor="ip_address" className="form__label form__label--with-desc">
<Trans>blocking_ipv6</Trans>
</s> add <label className="form__label form__label--with-desc"
htmlFor={name}><Trans>{name}</Trans> </s> remove </div>
</s> add </div>)} </s> add <Field
id="bootstrap_dns"
name="bootstrap_dns"
component="textarea"
type="text"
className="form-control form-control--textarea form-control--textarea-small"
placeholder={t('bootstrap_dns')}
disabled={processingSetConfig}
/> | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Config/Form.js |
keep replace keep keep replace keep keep | <mask> placeholder={t('form_enter_ip')}
<mask> validate={[ipv6, required]}
<mask> />
<mask> </div>
<mask> </div>
<mask> </Fragment>
<mask> )}
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove name="blocking_ipv6"
</s> add name={name} </s> remove <div className="col-12 col-sm-6">
<div className="form__group form__group--settings">
<label htmlFor="blocking_ipv4" className="form__label form__label--with-desc">
<Trans>blocking_ipv4</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>blocking_ipv4_desc</Trans>
</div>
<Field
name="blocking_ipv4"
component={renderInputField}
className="form-control"
placeholder={t('form_enter_ip')}
validate={[ipv4, required]}
/>
</div>
</div>
<div className="col-12 col-sm-6">
</s> add {customIps.map(({
description,
name,
validateIp,
}) => <div className="col-12 col-sm-6" key={name}> </s> remove </Fragment>
)}
</s> add </Fragment>} </s> remove processingSetUpstream={settings.processingSetUpstream}
setUpstream={setUpstream}
</s> add </s> remove <div className="col-12">
<div className="form__group form__group--settings">
<Field
name="edns_cs_enabled"
type="checkbox"
component={renderSelectField}
placeholder={t('edns_enable')}
disabled={processing}
subtitle={t('edns_cs_desc')}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="dnssec_enabled"
type="checkbox"
component={renderSelectField}
placeholder={t('dnssec_enable')}
disabled={processing}
subtitle={t('dnssec_enable_desc')}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="disable_ipv6"
type="checkbox"
component={renderSelectField}
placeholder={t('disable_ipv6')}
disabled={processing}
subtitle={t('disable_ipv6_desc')}
/>
</div>
</div>
</s> add {checkboxes.map(({ name, placeholder, subtitle }) =>
<div className="col-12" key={name}>
<div className="form__group form__group--settings">
<Field
name={name}
type="checkbox"
component={renderSelectField}
placeholder={t(placeholder)}
disabled={processing}
subtitle={t(subtitle)}
/>
</div>
</div>)} | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Config/Form.js |
keep keep keep keep replace replace keep keep keep keep keep | <mask> disabled={submitting || invalid || processing}
<mask> >
<mask> <Trans>save_btn</Trans>
<mask> </button>
<mask> </form>
<mask> );
<mask>
<mask> Form.propTypes = {
<mask> blockingMode: PropTypes.string.isRequired,
<mask> handleSubmit: PropTypes.func.isRequired,
<mask> submitting: PropTypes.bool.isRequired,
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove submitting || invalid || processingSetUpstream || processingTestUpstream
</s> add submitting || invalid || processingSetConfig || processingTestUpstream </s> remove disabled={!upstreamDns || processingTestUpstream}
</s> add disabled={!upstream_dns || processingTestUpstream} </s> remove processingSetUpstream: PropTypes.bool.isRequired,
</s> add </s> remove upstreamDns: PropTypes.string,
bootstrapDns: PropTypes.string,
allServers: PropTypes.bool,
setUpstream: PropTypes.func.isRequired,
</s> add </s> add dnsConfig: PropTypes.object.isRequired,
setDnsConfig: PropTypes.func.isRequired, </s> remove upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
</s> add upstream_dns,
bootstrap_dns, | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Config/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> import { Trans, withNamespaces } from 'react-i18next';
<mask> import flow from 'lodash/flow';
<mask> import classnames from 'classnames';
<mask>
<mask> import { renderSelectField } from '../../../../helpers/form';
<mask> import Examples from './Examples';
<mask>
<mask> let Form = (props) => {
<mask> const {
<mask> t,
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove import { handleUpstreamChange, setUpstream, testUpstream, getDnsSettings } from '../actions';
</s> add import { testUpstream } from '../actions'; </s> add import { normalizeTextarea } from '../helpers/helpers'; </s> remove this.props.getDnsSettings();
</s> add </s> remove this.props.setUpstream(values);
</s> add this.props.setDnsConfig(values); </s> remove const getFields = (processing, t) => Object.values(BLOCKING_MODES).map(mode => (
<Field
key={mode}
name="blocking_mode"
type="radio"
component={renderRadioField}
value={mode}
placeholder={t(mode)}
disabled={processing}
/>
));
</s> add const checkboxes = [{
name: 'edns_cs_enabled',
placeholder: 'edns_enable',
subtitle: 'edns_cs_desc',
},
{
name: 'dnssec_enabled',
placeholder: 'dnssec_enable',
subtitle: 'dnssec_enable_desc',
},
{
name: 'disable_ipv6',
placeholder: 'disable_ipv6',
subtitle: 'disable_ipv6_desc',
}];
const customIps = [{
description: 'blocking_ipv4_desc',
name: 'blocking_ipv4',
validateIp: ipv4,
},
{
description: 'blocking_ipv6_desc',
name: 'blocking_ipv6',
validateIp: ipv6,
}];
const getFields = (processing, t) => Object.values(BLOCKING_MODES)
.map(mode => (
<Field
key={mode}
name="blocking_mode"
type="radio"
component={renderRadioField}
value={mode}
placeholder={t(mode)}
disabled={processing}
/>
)); </s> remove }) => (
</s> add }) => | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/Form.js |
keep keep keep keep replace replace replace keep keep replace keep keep keep keep | <mask> const {
<mask> t,
<mask> handleSubmit,
<mask> testUpstream,
<mask> upstreamDns,
<mask> bootstrapDns,
<mask> allServers,
<mask> submitting,
<mask> invalid,
<mask> processingSetUpstream,
<mask> processingTestUpstream,
<mask> } = props;
<mask>
<mask> const testButtonClass = classnames({
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> add fastest_addr,
parallel_requests,
upstream_dns,
bootstrap_dns, </s> remove upstreamDns: upstream_dns,
bootstrapDns: bootstrap_dns,
allServers: all_servers,
processingSetUpstream,
</s> add </s> remove }) => (
</s> add }) => </s> remove language,
</s> add </s> remove upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/Form.js |
keep keep add keep keep keep keep keep | <mask> invalid,
<mask> processingSetConfig,
<mask> processingTestUpstream,
<mask> } = props;
<mask>
<mask> const testButtonClass = classnames({
<mask> 'btn btn-primary btn-standard mr-2': true,
<mask> 'btn btn-primary btn-standard mr-2 btn-loading': processingTestUpstream,
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove processingSetUpstream,
</s> add processingSetConfig, </s> remove upstreamDns,
bootstrapDns,
allServers,
</s> add </s> add dnsConfig: {
upstream_dns,
bootstrap_dns,
fastest_addr,
parallel_requests,
processingSetConfig,
}, </s> remove upstreamDns: upstream_dns,
bootstrapDns: bootstrap_dns,
allServers: all_servers,
processingSetUpstream,
</s> add </s> remove handleUpstreamChange,
setUpstream,
</s> add </s> remove processingDnsSettings: true,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/Form.js |
keep add keep keep keep keep | <mask> });
<mask>
<mask> return (
<mask> <form onSubmit={handleSubmit}>
<mask> <div className="row">
<mask> {INPUT_FIELDS.map(({
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove }) => (
</s> add }) => </s> remove <label htmlFor="ratelimit" className="form__label form__label--with-desc">
</s> add <label htmlFor="ratelimit"
className="form__label form__label--with-desc"> </s> remove <div className="col-12">
<div className="form__group form__group--settings">
<label className="form__label" htmlFor="upstream_dns">
<Trans>upstream_dns</Trans>
</label>
<Field
id="upstream_dns"
name="upstream_dns"
component="textarea"
type="text"
className="form-control form-control--textarea"
placeholder={t('upstream_dns')}
disabled={processingSetUpstream || processingTestUpstream}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="all_servers"
type="checkbox"
component={renderSelectField}
placeholder={t('upstream_parallel')}
disabled={processingSetUpstream}
/>
</div>
</div>
</s> add {INPUT_FIELDS.map(({
name, component, type, className, placeholder, getTitle, subtitle, disabled,
}) => <div className="col-12 mb-4" key={name}>
{typeof getTitle === 'function' && getTitle()}
<Field
id={name}
name={name}
component={component}
type={type}
className={className}
placeholder={t(placeholder)}
subtitle={t(subtitle)}
disabled={processingSetConfig || processingTestUpstream || disabled}
/>
</div>)} </s> remove {Object.values(BLOCKING_MODES).map(mode => (
<li key={mode}>
<Trans >{`blocking_mode_${mode}`}</Trans>
</li>
))}
</s> add {Object.values(BLOCKING_MODES)
.map(mode => (
<li key={mode}>
<Trans>{`blocking_mode_${mode}`}</Trans>
</li>
))} </s> remove const getFields = (processing, t) => Object.values(BLOCKING_MODES).map(mode => (
<Field
key={mode}
name="blocking_mode"
type="radio"
component={renderRadioField}
value={mode}
placeholder={t(mode)}
disabled={processing}
/>
));
</s> add const checkboxes = [{
name: 'edns_cs_enabled',
placeholder: 'edns_enable',
subtitle: 'edns_cs_desc',
},
{
name: 'dnssec_enabled',
placeholder: 'dnssec_enable',
subtitle: 'dnssec_enable_desc',
},
{
name: 'disable_ipv6',
placeholder: 'disable_ipv6',
subtitle: 'disable_ipv6_desc',
}];
const customIps = [{
description: 'blocking_ipv4_desc',
name: 'blocking_ipv4',
validateIp: ipv4,
},
{
description: 'blocking_ipv6_desc',
name: 'blocking_ipv6',
validateIp: ipv6,
}];
const getFields = (processing, t) => Object.values(BLOCKING_MODES)
.map(mode => (
<Field
key={mode}
name="blocking_mode"
type="radio"
component={renderRadioField}
value={mode}
placeholder={t(mode)}
disabled={processing}
/>
)); </s> remove <div className="col-12 col-sm-6">
<div className="form__group form__group--settings">
<label htmlFor="blocking_ipv4" className="form__label form__label--with-desc">
<Trans>blocking_ipv4</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>blocking_ipv4_desc</Trans>
</div>
<Field
name="blocking_ipv4"
component={renderInputField}
className="form-control"
placeholder={t('form_enter_ip')}
validate={[ipv4, required]}
/>
</div>
</div>
<div className="col-12 col-sm-6">
</s> add {customIps.map(({
description,
name,
validateIp,
}) => <div className="col-12 col-sm-6" key={name}> | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/Form.js |
keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace | <mask> return (
<mask> <form onSubmit={handleSubmit}>
<mask> <div className="row">
<mask> <div className="col-12">
<mask> <div className="form__group form__group--settings">
<mask> <label className="form__label" htmlFor="upstream_dns">
<mask> <Trans>upstream_dns</Trans>
<mask> </label>
<mask> <Field
<mask> id="upstream_dns"
<mask> name="upstream_dns"
<mask> component="textarea"
<mask> type="text"
<mask> className="form-control form-control--textarea"
<mask> placeholder={t('upstream_dns')}
<mask> disabled={processingSetUpstream || processingTestUpstream}
<mask> />
<mask> </div>
<mask> </div>
<mask> <div className="col-12">
<mask> <div className="form__group form__group--settings">
<mask> <Field
<mask> name="all_servers"
<mask> type="checkbox"
<mask> component={renderSelectField}
<mask> placeholder={t('upstream_parallel')}
<mask> disabled={processingSetUpstream}
<mask> />
<mask> </div>
<mask> </div>
<mask> <div className="col-12">
<mask> <Examples />
<mask> <hr />
<mask> </div>
<mask> <div className="col-12">
<mask> <Examples />
<mask> <hr />
<mask> </div>
<mask> <div className="col-12">
<mask> <div className="form__group">
<mask> <label
<mask> className="form__label form__label--with-desc"
<mask> htmlFor="bootstrap_dns"
<mask> >
<mask> <Trans>bootstrap_dns</Trans>
<mask> </label>
<mask> <div className="form__desc form__desc--top">
<mask> <Trans>bootstrap_dns_desc</Trans>
<mask> </div>
<mask> <Field
<mask> id="bootstrap_dns"
<mask> name="bootstrap_dns"
<mask> component="textarea"
<mask> type="text"
<mask> className="form-control form-control--textarea form-control--textarea-small"
<mask> placeholder={t('bootstrap_dns')}
<mask> disabled={processingSetUpstream}
<mask> />
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove <div className="col-12">
<div className="form__group form__group--settings">
<Field
name="edns_cs_enabled"
type="checkbox"
component={renderSelectField}
placeholder={t('edns_enable')}
disabled={processing}
subtitle={t('edns_cs_desc')}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="dnssec_enabled"
type="checkbox"
component={renderSelectField}
placeholder={t('dnssec_enable')}
disabled={processing}
subtitle={t('dnssec_enable_desc')}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="disable_ipv6"
type="checkbox"
component={renderSelectField}
placeholder={t('disable_ipv6')}
disabled={processing}
subtitle={t('disable_ipv6_desc')}
/>
</div>
</div>
</s> add {checkboxes.map(({ name, placeholder, subtitle }) =>
<div className="col-12" key={name}>
<div className="form__group form__group--settings">
<Field
name={name}
type="checkbox"
component={renderSelectField}
placeholder={t(placeholder)}
disabled={processing}
subtitle={t(subtitle)}
/>
</div>
</div>)} </s> add <Field
id="bootstrap_dns"
name="bootstrap_dns"
component="textarea"
type="text"
className="form-control form-control--textarea form-control--textarea-small"
placeholder={t('bootstrap_dns')}
disabled={processingSetConfig}
/> </s> remove <label htmlFor="ip_address" className="form__label form__label--with-desc">
<Trans>blocking_ipv6</Trans>
</s> add <label className="form__label form__label--with-desc"
htmlFor={name}><Trans>{name}</Trans> </s> remove <div className="col-12 col-sm-6">
<div className="form__group form__group--settings">
<label htmlFor="blocking_ipv4" className="form__label form__label--with-desc">
<Trans>blocking_ipv4</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>blocking_ipv4_desc</Trans>
</div>
<Field
name="blocking_ipv4"
component={renderInputField}
className="form-control"
placeholder={t('form_enter_ip')}
validate={[ipv4, required]}
/>
</div>
</div>
<div className="col-12 col-sm-6">
</s> add {customIps.map(({
description,
name,
validateIp,
}) => <div className="col-12 col-sm-6" key={name}> </s> remove <label htmlFor="ratelimit" className="form__label form__label--with-desc">
</s> add <label htmlFor="ratelimit"
className="form__label form__label--with-desc"> | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/Form.js |
keep keep add keep keep keep keep keep | <mask> <div className="form__desc form__desc--top">
<mask> <Trans>bootstrap_dns_desc</Trans>
<mask> </div>
<mask> </div>
<mask> </div>
<mask> <div className="card-actions">
<mask> <div className="btn-list">
<mask> <button
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove <div className="col-12">
<div className="form__group">
<label
className="form__label form__label--with-desc"
htmlFor="bootstrap_dns"
>
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans>
</div>
<Field
id="bootstrap_dns"
name="bootstrap_dns"
component="textarea"
type="text"
className="form-control form-control--textarea form-control--textarea-small"
placeholder={t('bootstrap_dns')}
disabled={processingSetUpstream}
/>
</s> add <div className="col-12 mb-4">
<label
className="form__label form__label--with-desc"
htmlFor="bootstrap_dns"
>
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans> </s> remove <label htmlFor="ip_address" className="form__label form__label--with-desc">
<Trans>blocking_ipv6</Trans>
</s> add <label className="form__label form__label--with-desc"
htmlFor={name}><Trans>{name}</Trans> </s> remove <div className="col-12 col-sm-6">
<div className="form__group form__group--settings">
<label htmlFor="blocking_ipv4" className="form__label form__label--with-desc">
<Trans>blocking_ipv4</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>blocking_ipv4_desc</Trans>
</div>
<Field
name="blocking_ipv4"
component={renderInputField}
className="form-control"
placeholder={t('form_enter_ip')}
validate={[ipv4, required]}
/>
</div>
</div>
<div className="col-12 col-sm-6">
</s> add {customIps.map(({
description,
name,
validateIp,
}) => <div className="col-12 col-sm-6" key={name}> </s> remove <label htmlFor="ratelimit" className="form__label form__label--with-desc">
</s> add <label htmlFor="ratelimit"
className="form__label form__label--with-desc"> </s> remove {Object.values(BLOCKING_MODES).map(mode => (
<li key={mode}>
<Trans >{`blocking_mode_${mode}`}</Trans>
</li>
))}
</s> add {Object.values(BLOCKING_MODES)
.map(mode => (
<li key={mode}>
<Trans>{`blocking_mode_${mode}`}</Trans>
</li>
))} </s> remove name="blocking_ipv6"
</s> add name={name} | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/Form.js |
keep keep replace replace replace keep keep replace keep | <mask> onClick={() =>
<mask> testUpstream({
<mask> upstream_dns: upstreamDns,
<mask> bootstrap_dns: bootstrapDns,
<mask> all_servers: allServers,
<mask> })
<mask> }
<mask> disabled={!upstreamDns || processingTestUpstream}
<mask> >
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove language,
</s> add </s> remove upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
</s> add </s> remove [actions.getDnsSettingsRequest]: state => ({ ...state, processingDnsSettings: true }),
[actions.getDnsSettingsFailure]: state => ({ ...state, processingDnsSettings: false }),
[actions.getDnsSettingsSuccess]: (state, { payload }) => {
const {
upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
} = payload;
return {
...state,
allServers,
upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
processingDnsSettings: false,
};
},
</s> add </s> add upstream_dns: (upstream_dns && upstream_dns.join('\n')) || '',
bootstrap_dns: (bootstrap_dns && bootstrap_dns.join('\n')) || '', </s> remove upstreamDns,
bootstrapDns,
allServers,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> <button
<mask> type="submit"
<mask> className="btn btn-success btn-standard"
<mask> disabled={
<mask> submitting || invalid || processingSetUpstream || processingTestUpstream
<mask> }
<mask> >
<mask> <Trans>apply_btn</Trans>
<mask> </button>
<mask> </div>
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove disabled={!upstreamDns || processingTestUpstream}
</s> add disabled={!upstream_dns || processingTestUpstream} </s> remove </form>
);
</s> add </form>; </s> remove </div>
</s> add </div>)} </s> remove <div className="col-12">
<div className="form__group form__group--settings">
<label className="form__label" htmlFor="upstream_dns">
<Trans>upstream_dns</Trans>
</label>
<Field
id="upstream_dns"
name="upstream_dns"
component="textarea"
type="text"
className="form-control form-control--textarea"
placeholder={t('upstream_dns')}
disabled={processingSetUpstream || processingTestUpstream}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="all_servers"
type="checkbox"
component={renderSelectField}
placeholder={t('upstream_parallel')}
disabled={processingSetUpstream}
/>
</div>
</div>
</s> add {INPUT_FIELDS.map(({
name, component, type, className, placeholder, getTitle, subtitle, disabled,
}) => <div className="col-12 mb-4" key={name}>
{typeof getTitle === 'function' && getTitle()}
<Field
id={name}
name={name}
component={component}
type={type}
className={className}
placeholder={t(placeholder)}
subtitle={t(subtitle)}
disabled={processingSetConfig || processingTestUpstream || disabled}
/>
</div>)} </s> remove upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
</s> add upstream_dns,
bootstrap_dns, </s> add upstream_dns: (upstream_dns && upstream_dns.join('\n')) || '',
bootstrap_dns: (bootstrap_dns && bootstrap_dns.join('\n')) || '', | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/Form.js |
keep keep keep keep replace replace replace keep replace | <mask> testUpstream: PropTypes.func,
<mask> submitting: PropTypes.bool,
<mask> invalid: PropTypes.bool,
<mask> initialValues: PropTypes.object,
<mask> upstreamDns: PropTypes.string,
<mask> bootstrapDns: PropTypes.string,
<mask> allServers: PropTypes.bool,
<mask> processingTestUpstream: PropTypes.bool,
<mask> processingSetUpstream: PropTypes.bool,
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove upstreamDns: PropTypes.string,
bootstrapDns: PropTypes.string,
allServers: PropTypes.bool,
setUpstream: PropTypes.func.isRequired,
</s> add </s> remove processingSetUpstream: PropTypes.bool.isRequired,
</s> add </s> remove upstreamDns: upstream_dns,
bootstrapDns: bootstrap_dns,
allServers: all_servers,
processingSetUpstream,
</s> add </s> remove processingDnsSettings: true,
</s> add </s> remove upstreamDns: '',
bootstrapDns: '',
allServers: false,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/Form.js |
keep keep keep keep replace replace replace keep replace replace replace keep keep keep | <mask>
<mask> const selector = formValueSelector('upstreamForm');
<mask>
<mask> Form = connect((state) => {
<mask> const upstreamDns = selector(state, 'upstream_dns');
<mask> const bootstrapDns = selector(state, 'bootstrap_dns');
<mask> const allServers = selector(state, 'all_servers');
<mask> return {
<mask> upstreamDns,
<mask> bootstrapDns,
<mask> allServers,
<mask> };
<mask> })(Form);
<mask>
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove [actions.handleUpstreamChange]: (state, { payload }) => {
const { upstreamDns } = payload;
return { ...state, upstreamDns };
},
</s> add </s> remove processingSetUpstream: PropTypes.bool,
</s> add processingSetConfig: PropTypes.bool, </s> remove upstreamDns,
bootstrapDns,
allServers,
</s> add </s> remove upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
</s> add </s> remove language,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/Form.js |
keep keep keep keep replace keep keep keep keep keep | <mask> import Card from '../../../ui/Card';
<mask>
<mask> class Upstream extends Component {
<mask> handleSubmit = (values) => {
<mask> this.props.setUpstream(values);
<mask> };
<mask>
<mask> handleTest = (values) => {
<mask> this.props.testUpstream(values);
<mask> };
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove this.props.getDnsSettings();
</s> add </s> remove import { renderSelectField } from '../../../../helpers/form';
</s> add </s> remove import { handleUpstreamChange, setUpstream, testUpstream, getDnsSettings } from '../actions';
</s> add import { testUpstream } from '../actions'; </s> add import { normalizeTextarea } from '../helpers/helpers'; </s> remove [actions.handleUpstreamChange]: (state, { payload }) => {
const { upstreamDns } = payload;
return { ...state, upstreamDns };
},
</s> add </s> remove [actions.setUpstreamRequest]: state => ({ ...state, processingSetUpstream: true }),
[actions.setUpstreamFailure]: state => ({ ...state, processingSetUpstream: false }),
[actions.setUpstreamSuccess]: (state, { payload }) => ({
...state,
...payload,
processingSetUpstream: false,
}),
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/index.js |
keep keep keep keep replace replace replace replace keep keep keep keep keep | <mask>
<mask> render() {
<mask> const {
<mask> t,
<mask> upstreamDns: upstream_dns,
<mask> bootstrapDns: bootstrap_dns,
<mask> allServers: all_servers,
<mask> processingSetUpstream,
<mask> processingTestUpstream,
<mask> } = this.props;
<mask>
<mask> return (
<mask> <Card
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> add dnsConfig: {
upstream_dns,
bootstrap_dns,
fastest_addr,
parallel_requests,
processingSetConfig,
}, </s> remove upstreamDns,
bootstrapDns,
allServers,
</s> add </s> remove all_servers,
</s> add fastest_addr,
parallel_requests, </s> add fastest_addr,
parallel_requests,
upstream_dns,
bootstrap_dns, </s> add upstream_dns,
bootstrap_dns, </s> remove dashboard,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/index.js |
keep add keep keep keep keep keep | <mask> t,
<mask> processingTestUpstream,
<mask> } = this.props;
<mask>
<mask> return (
<mask> <Card
<mask> title={t('upstream_dns')}
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove upstreamDns: upstream_dns,
bootstrapDns: bootstrap_dns,
allServers: all_servers,
processingSetUpstream,
</s> add </s> remove upstreamDns,
bootstrapDns,
allServers,
</s> add </s> remove const isDataLoading = dashboard.processingDnsSettings
|| access.processing
|| dnsConfig.processingGetConfig;
const isDataReady = !dashboard.processingDnsSettings
&& !access.processing
&& !dnsConfig.processingGetConfig;
</s> add const isDataLoading = access.processing || dnsConfig.processingGetConfig; </s> add fastest_addr,
parallel_requests,
upstream_dns,
bootstrap_dns, </s> remove setUpstream,
</s> add </s> remove {isDataLoading && <Loading />}
{isDataReady && (
</s> add {isDataLoading ?
<Loading /> : | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/index.js |
keep keep keep keep replace keep keep keep keep replace keep keep keep | <mask> <Form
<mask> initialValues={{
<mask> upstream_dns,
<mask> bootstrap_dns,
<mask> all_servers,
<mask> }}
<mask> testUpstream={this.handleTest}
<mask> onSubmit={this.handleSubmit}
<mask> processingTestUpstream={processingTestUpstream}
<mask> processingSetUpstream={processingSetUpstream}
<mask> />
<mask> </div>
<mask> </div>
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove upstreamDns: upstream_dns,
bootstrapDns: bootstrap_dns,
allServers: all_servers,
processingSetUpstream,
</s> add </s> remove </div>
</s> add </div>)} </s> remove <div className="col-12">
<div className="form__group form__group--settings">
<Field
name="edns_cs_enabled"
type="checkbox"
component={renderSelectField}
placeholder={t('edns_enable')}
disabled={processing}
subtitle={t('edns_cs_desc')}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="dnssec_enabled"
type="checkbox"
component={renderSelectField}
placeholder={t('dnssec_enable')}
disabled={processing}
subtitle={t('dnssec_enable_desc')}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="disable_ipv6"
type="checkbox"
component={renderSelectField}
placeholder={t('disable_ipv6')}
disabled={processing}
subtitle={t('disable_ipv6_desc')}
/>
</div>
</div>
</s> add {checkboxes.map(({ name, placeholder, subtitle }) =>
<div className="col-12" key={name}>
<div className="form__group form__group--settings">
<Field
name={name}
type="checkbox"
component={renderSelectField}
placeholder={t(placeholder)}
disabled={processing}
subtitle={t(subtitle)}
/>
</div>
</div>)} </s> remove validate={[ipv6, required]}
</s> add validate={[validateIp, required]} </s> remove <div className="col-12">
<div className="form__group">
<label
className="form__label form__label--with-desc"
htmlFor="bootstrap_dns"
>
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans>
</div>
<Field
id="bootstrap_dns"
name="bootstrap_dns"
component="textarea"
type="text"
className="form-control form-control--textarea form-control--textarea-small"
placeholder={t('bootstrap_dns')}
disabled={processingSetUpstream}
/>
</s> add <div className="col-12 mb-4">
<label
className="form__label form__label--with-desc"
htmlFor="bootstrap_dns"
>
<Trans>bootstrap_dns</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>bootstrap_dns_desc</Trans> | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/index.js |
keep replace replace replace replace keep replace | <mask> Upstream.propTypes = {
<mask> upstreamDns: PropTypes.string,
<mask> bootstrapDns: PropTypes.string,
<mask> allServers: PropTypes.bool,
<mask> setUpstream: PropTypes.func.isRequired,
<mask> testUpstream: PropTypes.func.isRequired,
<mask> processingSetUpstream: PropTypes.bool.isRequired,
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove upstreamDns: PropTypes.string,
bootstrapDns: PropTypes.string,
allServers: PropTypes.bool,
</s> add upstream_dns: PropTypes.string,
bootstrap_dns: PropTypes.string,
fastest_addr: PropTypes.bool,
parallel_requests: PropTypes.bool, </s> remove processingSetUpstream: PropTypes.bool,
</s> add processingSetConfig: PropTypes.bool, </s> add dnsConfig: PropTypes.object.isRequired,
setDnsConfig: PropTypes.func.isRequired, </s> remove setUpstream: PropTypes.func.isRequired,
</s> add </s> remove dashboard: PropTypes.object.isRequired,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/index.js |
keep keep keep add keep keep keep | <mask> Upstream.propTypes = {
<mask> testUpstream: PropTypes.func.isRequired,
<mask> processingTestUpstream: PropTypes.bool.isRequired,
<mask> t: PropTypes.func.isRequired,
<mask> };
<mask>
<mask> export default withNamespaces()(Upstream);
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove processingSetUpstream: PropTypes.bool.isRequired,
</s> add </s> remove upstreamDns: PropTypes.string,
bootstrapDns: PropTypes.string,
allServers: PropTypes.bool,
setUpstream: PropTypes.func.isRequired,
</s> add </s> remove getDnsSettings: PropTypes.func.isRequired,
</s> add </s> remove setUpstream: PropTypes.func.isRequired,
</s> add </s> remove dashboard: PropTypes.object.isRequired,
</s> add </s> remove </form>
);
</s> add </form>; | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/Upstream/index.js |
keep keep keep keep replace keep keep keep keep keep | <mask> import Loading from '../../ui/Loading';
<mask>
<mask> class Dns extends Component {
<mask> componentDidMount() {
<mask> this.props.getDnsSettings();
<mask> this.props.getAccessList();
<mask> this.props.getDnsConfig();
<mask> }
<mask>
<mask> render() {
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove this.props.setUpstream(values);
</s> add this.props.setDnsConfig(values); </s> remove import { handleUpstreamChange, setUpstream, testUpstream, getDnsSettings } from '../actions';
</s> add import { testUpstream } from '../actions'; </s> remove import { renderSelectField } from '../../../../helpers/form';
</s> add </s> add import { normalizeTextarea } from '../helpers/helpers'; </s> remove dashboard,
</s> add </s> remove upstreamDns: upstream_dns,
bootstrapDns: bootstrap_dns,
allServers: all_servers,
processingSetUpstream,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/index.js |
keep keep replace keep keep keep keep replace | <mask> const {
<mask> t,
<mask> dashboard,
<mask> settings,
<mask> access,
<mask> setAccessList,
<mask> testUpstream,
<mask> setUpstream,
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove handleUpstreamChange,
setUpstream,
</s> add </s> remove upstreamDns,
bootstrapDns,
allServers,
</s> add </s> remove import { handleUpstreamChange, setUpstream, testUpstream, getDnsSettings } from '../actions';
</s> add import { testUpstream } from '../actions'; </s> remove upstreamDns: upstream_dns,
bootstrapDns: bootstrap_dns,
allServers: all_servers,
processingSetUpstream,
</s> add </s> remove import { renderSelectField } from '../../../../helpers/form';
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/index.js |
keep keep keep keep replace replace replace replace replace replace keep keep keep keep replace replace keep keep keep keep | <mask> dnsConfig,
<mask> setDnsConfig,
<mask> } = this.props;
<mask>
<mask> const isDataLoading = dashboard.processingDnsSettings
<mask> || access.processing
<mask> || dnsConfig.processingGetConfig;
<mask> const isDataReady = !dashboard.processingDnsSettings
<mask> && !access.processing
<mask> && !dnsConfig.processingGetConfig;
<mask>
<mask> return (
<mask> <Fragment>
<mask> <PageTitle title={t('dns_settings')} />
<mask> {isDataLoading && <Loading />}
<mask> {isDataReady && (
<mask> <Fragment>
<mask> <Config
<mask> dnsConfig={dnsConfig}
<mask> setDnsConfig={setDnsConfig}
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove setUpstream,
</s> add </s> remove <Fragment>
<label className={`checkbox ${modifier}`}>
<span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
<span className="checkbox__label">
<span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && (
<span
className="checkbox__label-subtitle"
dangerouslySetInnerHTML={{ __html: subtitle }}
/>
)}
</s> add <Fragment>
<label className={`checkbox ${modifier}`} onClick={onClick}>
<span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
<span className="checkbox__label">
<span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && (
<span
className="checkbox__label-subtitle"
dangerouslySetInnerHTML={{ __html: subtitle }}
/>
)}
</span> </s> remove upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
allServers,
</s> add </s> add upstream_dns: (upstream_dns && upstream_dns.join('\n')) || '',
bootstrap_dns: (bootstrap_dns && bootstrap_dns.join('\n')) || '', </s> remove </span>
</label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>
</s> add </label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment> | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/index.js |
keep keep replace replace replace keep replace replace keep | <mask> />
<mask> <Upstream
<mask> upstreamDns={dashboard.upstreamDns}
<mask> bootstrapDns={dashboard.bootstrapDns}
<mask> allServers={dashboard.allServers}
<mask> processingTestUpstream={settings.processingTestUpstream}
<mask> processingSetUpstream={settings.processingSetUpstream}
<mask> setUpstream={setUpstream}
<mask> testUpstream={testUpstream}
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> add dnsConfig={dnsConfig}
setDnsConfig={setDnsConfig} </s> remove </Fragment>
)}
</s> add </Fragment>} </s> remove {isDataLoading && <Loading />}
{isDataReady && (
</s> add {isDataLoading ?
<Loading /> : </s> remove <Fragment>
<label className={`checkbox ${modifier}`}>
<span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
<span className="checkbox__label">
<span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && (
<span
className="checkbox__label-subtitle"
dangerouslySetInnerHTML={{ __html: subtitle }}
/>
)}
</s> add <Fragment>
<label className={`checkbox ${modifier}`} onClick={onClick}>
<span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
<span className="checkbox__label">
<span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && (
<span
className="checkbox__label-subtitle"
dangerouslySetInnerHTML={{ __html: subtitle }}
/>
)}
</span> </s> remove <div className="col-12">
<div className="form__group form__group--settings">
<Field
name="edns_cs_enabled"
type="checkbox"
component={renderSelectField}
placeholder={t('edns_enable')}
disabled={processing}
subtitle={t('edns_cs_desc')}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="dnssec_enabled"
type="checkbox"
component={renderSelectField}
placeholder={t('dnssec_enable')}
disabled={processing}
subtitle={t('dnssec_enable_desc')}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="disable_ipv6"
type="checkbox"
component={renderSelectField}
placeholder={t('disable_ipv6')}
disabled={processing}
subtitle={t('disable_ipv6_desc')}
/>
</div>
</div>
</s> add {checkboxes.map(({ name, placeholder, subtitle }) =>
<div className="col-12" key={name}>
<div className="form__group form__group--settings">
<Field
name={name}
type="checkbox"
component={renderSelectField}
placeholder={t(placeholder)}
disabled={processing}
subtitle={t(subtitle)}
/>
</div>
</div>)} | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/index.js |
keep add keep keep keep keep keep keep | <mask> processingTestUpstream={settings.processingTestUpstream}
<mask> testUpstream={testUpstream}
<mask> />
<mask> <Access access={access} setAccessList={setAccessList} />
<mask> </Fragment>}
<mask> </Fragment>
<mask> );
<mask> }
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove </Fragment>
)}
</s> add </Fragment>} </s> remove processingSetUpstream={settings.processingSetUpstream}
setUpstream={setUpstream}
</s> add </s> remove upstreamDns={dashboard.upstreamDns}
bootstrapDns={dashboard.bootstrapDns}
allServers={dashboard.allServers}
</s> add </s> remove </span>
</label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>
</s> add </label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment> </s> remove processingSetUpstream={processingSetUpstream}
</s> add processingSetConfig={processingSetConfig} </s> remove </div>
</s> add </div>)} | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/index.js |
keep keep keep keep replace replace keep keep keep keep keep | <mask> setUpstream={setUpstream}
<mask> testUpstream={testUpstream}
<mask> />
<mask> <Access access={access} setAccessList={setAccessList} />
<mask> </Fragment>
<mask> )}
<mask> </Fragment>
<mask> );
<mask> }
<mask> }
<mask>
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove processingSetUpstream={settings.processingSetUpstream}
setUpstream={setUpstream}
</s> add </s> add dnsConfig={dnsConfig}
setDnsConfig={setDnsConfig} </s> remove </div>
</s> add </div>)} </s> remove </span>
</label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment>
</s> add </label>
{!disabled &&
touched &&
(error && <span className="form__message form__message--error">{error}</span>)}
</Fragment> </s> remove validate={[ipv6, required]}
</s> add validate={[validateIp, required]} </s> remove upstreamDns={dashboard.upstreamDns}
bootstrapDns={dashboard.bootstrapDns}
allServers={dashboard.allServers}
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/index.js |
keep keep keep replace keep replace | <mask> }
<mask>
<mask> Dns.propTypes = {
<mask> dashboard: PropTypes.object.isRequired,
<mask> settings: PropTypes.object.isRequired,
<mask> setUpstream: PropTypes.func.isRequired,
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove getDnsSettings: PropTypes.func.isRequired,
</s> add </s> add dnsConfig: PropTypes.object.isRequired,
setDnsConfig: PropTypes.func.isRequired, </s> remove upstreamDns: PropTypes.string,
bootstrapDns: PropTypes.string,
allServers: PropTypes.bool,
setUpstream: PropTypes.func.isRequired,
</s> add </s> remove processingSetUpstream: PropTypes.bool.isRequired,
</s> add </s> remove </form>
);
</s> add </form>; | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/index.js |
keep keep keep keep replace keep keep keep keep keep | <mask> testUpstream: PropTypes.func.isRequired,
<mask> getAccessList: PropTypes.func.isRequired,
<mask> setAccessList: PropTypes.func.isRequired,
<mask> access: PropTypes.object.isRequired,
<mask> getDnsSettings: PropTypes.func.isRequired,
<mask> dnsConfig: PropTypes.object.isRequired,
<mask> setDnsConfig: PropTypes.func.isRequired,
<mask> getDnsConfig: PropTypes.func.isRequired,
<mask> t: PropTypes.func.isRequired,
<mask> };
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove setUpstream: PropTypes.func.isRequired,
</s> add </s> add dnsConfig: PropTypes.object.isRequired,
setDnsConfig: PropTypes.func.isRequired, </s> remove dashboard: PropTypes.object.isRequired,
</s> add </s> remove processingSetUpstream: PropTypes.bool.isRequired,
</s> add </s> remove upstreamDns: PropTypes.string,
bootstrapDns: PropTypes.string,
allServers: PropTypes.bool,
setUpstream: PropTypes.func.isRequired,
</s> add </s> remove </form>
);
</s> add </form>; | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/Settings/Dns/index.js |
keep add keep keep keep keep keep keep | <mask> .checkbox__input:disabled + .checkbox__label {
<mask> cursor: default;
<mask> }
<mask>
<mask> .checkbox__input:disabled + .checkbox__label:before {
<mask> opacity: 0.6;
<mask> }
<mask>
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove import { handleUpstreamChange, setUpstream, testUpstream, getDnsSettings } from '../actions';
</s> add import { testUpstream } from '../actions'; </s> remove setUpstream(url) {
const { path, method } = this.GLOBAL_SET_UPSTREAM_DNS;
const config = {
data: url,
headers: { 'Content-Type': 'application/json' },
};
return this.makeRequest(path, method, config);
}
</s> add </s> remove await apiClient.setDnsConfig(config);
dispatch(addSuccessToast('config_successfully_saved'));
</s> add const data = { ...config };
let hasDnsSettings = false;
if (Object.prototype.hasOwnProperty.call(data, 'bootstrap_dns')) {
data.bootstrap_dns = normalizeTextarea(config.bootstrap_dns);
hasDnsSettings = true;
}
if (Object.prototype.hasOwnProperty.call(data, 'upstream_dns')) {
data.upstream_dns = normalizeTextarea(config.upstream_dns);
hasDnsSettings = true;
}
await apiClient.setDnsConfig(data);
if (hasDnsSettings) {
dispatch(addSuccessToast('updated_upstream_dns_toast'));
} else {
dispatch(addSuccessToast('config_successfully_saved'));
}
</s> add import { normalizeTextarea } from '../helpers/helpers'; </s> remove dashboard: PropTypes.object.isRequired,
</s> add </s> remove import { renderSelectField } from '../../../../helpers/form';
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/components/ui/Checkbox.css |
keep replace keep keep keep keep keep | <mask> import { connect } from 'react-redux';
<mask> import { handleUpstreamChange, setUpstream, testUpstream, getDnsSettings } from '../actions';
<mask> import { getAccessList, setAccessList } from '../actions/access';
<mask> import {
<mask> getRewritesList,
<mask> addRewrite,
<mask> deleteRewrite,
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove import { renderSelectField } from '../../../../helpers/form';
</s> add </s> add import { normalizeTextarea } from '../helpers/helpers'; </s> remove handleUpstreamChange,
setUpstream,
</s> add </s> remove this.props.getDnsSettings();
</s> add </s> remove this.props.setUpstream(values);
</s> add this.props.setDnsConfig(values); </s> remove getDnsSettings,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/containers/Dns.js |
keep keep keep keep replace replace keep keep keep keep keep | <mask> return props;
<mask> };
<mask>
<mask> const mapDispatchToProps = {
<mask> handleUpstreamChange,
<mask> setUpstream,
<mask> testUpstream,
<mask> getAccessList,
<mask> setAccessList,
<mask> getRewritesList,
<mask> addRewrite,
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove import { handleUpstreamChange, setUpstream, testUpstream, getDnsSettings } from '../actions';
</s> add import { testUpstream } from '../actions'; </s> remove dashboard,
</s> add </s> remove setUpstream,
</s> add </s> remove getDnsSettings,
</s> add </s> remove upstreamDns,
bootstrapDns,
allServers,
</s> add </s> remove [actions.handleUpstreamChange]: (state, { payload }) => {
const { upstreamDns } = payload;
return { ...state, upstreamDns };
},
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/containers/Dns.js |
keep keep keep keep replace keep keep keep keep keep | <mask> getRewritesList,
<mask> addRewrite,
<mask> deleteRewrite,
<mask> toggleRewritesModal,
<mask> getDnsSettings,
<mask> getDnsConfig,
<mask> setDnsConfig,
<mask> };
<mask>
<mask> export default connect(
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove handleUpstreamChange,
setUpstream,
</s> add </s> remove import { handleUpstreamChange, setUpstream, testUpstream, getDnsSettings } from '../actions';
</s> add import { testUpstream } from '../actions'; </s> add dnsConfig: PropTypes.object.isRequired,
setDnsConfig: PropTypes.func.isRequired, </s> remove processingSetUpstream: PropTypes.bool.isRequired,
</s> add </s> remove upstreamDns,
bootstrapDns,
allServers,
</s> add upstream_dns,
bootstrap_dns,
fastest_addr,
parallel_requests, </s> remove export const getDnsSettingsRequest = createAction('GET_DNS_SETTINGS_REQUEST');
export const getDnsSettingsFailure = createAction('GET_DNS_SETTINGS_FAILURE');
export const getDnsSettingsSuccess = createAction('GET_DNS_SETTINGS_SUCCESS');
export const getDnsSettings = () => async (dispatch) => {
dispatch(getDnsSettingsRequest());
try {
const dnsStatus = await apiClient.getGlobalStatus();
dispatch(getDnsSettingsSuccess(dnsStatus));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(getDnsSettingsFailure());
}
};
export const handleUpstreamChange = createAction('HANDLE_UPSTREAM_CHANGE');
export const setUpstreamRequest = createAction('SET_UPSTREAM_REQUEST');
export const setUpstreamFailure = createAction('SET_UPSTREAM_FAILURE');
export const setUpstreamSuccess = createAction('SET_UPSTREAM_SUCCESS');
export const setUpstream = config => async (dispatch) => {
dispatch(setUpstreamRequest());
try {
const values = { ...config };
values.bootstrap_dns = normalizeTextarea(values.bootstrap_dns);
values.upstream_dns = normalizeTextarea(values.upstream_dns);
await apiClient.setUpstream(values);
dispatch(addSuccessToast('updated_upstream_dns_toast'));
dispatch(setUpstreamSuccess(config));
} catch (error) {
dispatch(addErrorToast({ error }));
dispatch(setUpstreamFailure());
}
};
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/containers/Dns.js |
keep keep add keep keep keep keep | <mask> placeholder,
<mask> subtitle,
<mask> disabled,
<mask> modifier = 'checkbox--form',
<mask> meta: { touched, error },
<mask> }) => (
<mask> <Fragment>
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove <Fragment>
<label className={`checkbox ${modifier}`}>
<span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
<span className="checkbox__label">
<span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && (
<span
className="checkbox__label-subtitle"
dangerouslySetInnerHTML={{ __html: subtitle }}
/>
)}
</s> add <Fragment>
<label className={`checkbox ${modifier}`} onClick={onClick}>
<span className="checkbox__marker" />
<input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
<span className="checkbox__label">
<span className="checkbox__label-text checkbox__label-text--long">
<span className="checkbox__label-title">{placeholder}</span>
{subtitle && (
<span
className="checkbox__label-subtitle"
dangerouslySetInnerHTML={{ __html: subtitle }}
/>
)}
</span> </s> remove <div className="col-12">
<div className="form__group form__group--settings">
<label className="form__label" htmlFor="upstream_dns">
<Trans>upstream_dns</Trans>
</label>
<Field
id="upstream_dns"
name="upstream_dns"
component="textarea"
type="text"
className="form-control form-control--textarea"
placeholder={t('upstream_dns')}
disabled={processingSetUpstream || processingTestUpstream}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="all_servers"
type="checkbox"
component={renderSelectField}
placeholder={t('upstream_parallel')}
disabled={processingSetUpstream}
/>
</div>
</div>
</s> add {INPUT_FIELDS.map(({
name, component, type, className, placeholder, getTitle, subtitle, disabled,
}) => <div className="col-12 mb-4" key={name}>
{typeof getTitle === 'function' && getTitle()}
<Field
id={name}
name={name}
component={component}
type={type}
className={className}
placeholder={t(placeholder)}
subtitle={t(subtitle)}
disabled={processingSetConfig || processingTestUpstream || disabled}
/>
</div>)} </s> remove [actions.handleUpstreamChange]: (state, { payload }) => {
const { upstreamDns } = payload;
return { ...state, upstreamDns };
},
</s> add </s> remove {isDataLoading && <Loading />}
{isDataReady && (
</s> add {isDataLoading ?
<Loading /> : </s> remove const getFields = (processing, t) => Object.values(BLOCKING_MODES).map(mode => (
<Field
key={mode}
name="blocking_mode"
type="radio"
component={renderRadioField}
value={mode}
placeholder={t(mode)}
disabled={processing}
/>
));
</s> add const checkboxes = [{
name: 'edns_cs_enabled',
placeholder: 'edns_enable',
subtitle: 'edns_cs_desc',
},
{
name: 'dnssec_enabled',
placeholder: 'dnssec_enable',
subtitle: 'dnssec_enable_desc',
},
{
name: 'disable_ipv6',
placeholder: 'disable_ipv6',
subtitle: 'disable_ipv6_desc',
}];
const customIps = [{
description: 'blocking_ipv4_desc',
name: 'blocking_ipv4',
validateIp: ipv4,
},
{
description: 'blocking_ipv6_desc',
name: 'blocking_ipv6',
validateIp: ipv6,
}];
const getFields = (processing, t) => Object.values(BLOCKING_MODES)
.map(mode => (
<Field
key={mode}
name="blocking_mode"
type="radio"
component={renderRadioField}
value={mode}
placeholder={t(mode)}
disabled={processing}
/>
)); </s> remove }) => (
</s> add }) => | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/helpers/form.js |
keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace keep replace replace replace replace replace replace keep keep | <mask> modifier = 'checkbox--form',
<mask> meta: { touched, error },
<mask> }) => (
<mask> <Fragment>
<mask> <label className={`checkbox ${modifier}`}>
<mask> <span className="checkbox__marker" />
<mask> <input {...input} type="checkbox" className="checkbox__input" disabled={disabled} />
<mask> <span className="checkbox__label">
<mask> <span className="checkbox__label-text checkbox__label-text--long">
<mask> <span className="checkbox__label-title">{placeholder}</span>
<mask> {subtitle && (
<mask> <span
<mask> className="checkbox__label-subtitle"
<mask> dangerouslySetInnerHTML={{ __html: subtitle }}
<mask> />
<mask> )}
<mask> </span>
<mask> </span>
<mask> </label>
<mask> {!disabled &&
<mask> touched &&
<mask> (error && <span className="form__message form__message--error">{error}</span>)}
<mask> </Fragment>
<mask> );
<mask>
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> add onClick, </s> remove {isDataLoading && <Loading />}
{isDataReady && (
</s> add {isDataLoading ?
<Loading /> : </s> remove const isDataLoading = dashboard.processingDnsSettings
|| access.processing
|| dnsConfig.processingGetConfig;
const isDataReady = !dashboard.processingDnsSettings
&& !access.processing
&& !dnsConfig.processingGetConfig;
</s> add const isDataLoading = access.processing || dnsConfig.processingGetConfig; </s> remove <div className="col-12 col-sm-6">
<div className="form__group form__group--settings">
<label htmlFor="blocking_ipv4" className="form__label form__label--with-desc">
<Trans>blocking_ipv4</Trans>
</label>
<div className="form__desc form__desc--top">
<Trans>blocking_ipv4_desc</Trans>
</div>
<Field
name="blocking_ipv4"
component={renderInputField}
className="form-control"
placeholder={t('form_enter_ip')}
validate={[ipv4, required]}
/>
</div>
</div>
<div className="col-12 col-sm-6">
</s> add {customIps.map(({
description,
name,
validateIp,
}) => <div className="col-12 col-sm-6" key={name}> </s> remove <div className="col-12">
<div className="form__group form__group--settings">
<label className="form__label" htmlFor="upstream_dns">
<Trans>upstream_dns</Trans>
</label>
<Field
id="upstream_dns"
name="upstream_dns"
component="textarea"
type="text"
className="form-control form-control--textarea"
placeholder={t('upstream_dns')}
disabled={processingSetUpstream || processingTestUpstream}
/>
</div>
</div>
<div className="col-12">
<div className="form__group form__group--settings">
<Field
name="all_servers"
type="checkbox"
component={renderSelectField}
placeholder={t('upstream_parallel')}
disabled={processingSetUpstream}
/>
</div>
</div>
</s> add {INPUT_FIELDS.map(({
name, component, type, className, placeholder, getTitle, subtitle, disabled,
}) => <div className="col-12 mb-4" key={name}>
{typeof getTitle === 'function' && getTitle()}
<Field
id={name}
name={name}
component={component}
type={type}
className={className}
placeholder={t(placeholder)}
subtitle={t(subtitle)}
disabled={processingSetConfig || processingTestUpstream || disabled}
/>
</div>)} | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/helpers/form.js |
keep keep add keep keep keep keep keep keep | <mask> const {
<mask> blocking_ipv4,
<mask> blocking_ipv6,
<mask> ...values
<mask> } = payload;
<mask>
<mask> return {
<mask> ...state,
<mask> ...values,
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove [actions.handleUpstreamChange]: (state, { payload }) => {
const { upstreamDns } = payload;
return { ...state, upstreamDns };
},
</s> add </s> remove [actions.getDnsSettingsRequest]: state => ({ ...state, processingDnsSettings: true }),
[actions.getDnsSettingsFailure]: state => ({ ...state, processingDnsSettings: false }),
[actions.getDnsSettingsSuccess]: (state, { payload }) => {
const {
upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
} = payload;
return {
...state,
allServers,
upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
processingDnsSettings: false,
};
},
</s> add </s> add language, </s> remove language,
</s> add </s> remove [actions.setUpstreamRequest]: state => ({ ...state, processingSetUpstream: true }),
[actions.setUpstreamFailure]: state => ({ ...state, processingSetUpstream: false }),
[actions.setUpstreamSuccess]: (state, { payload }) => ({
...state,
...payload,
processingSetUpstream: false,
}),
</s> add </s> remove upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/reducers/dnsConfig.js |
keep add keep keep keep keep keep keep | <mask> blocking_ipv4: blocking_ipv4 || DEFAULT_BLOCKING_IPV4,
<mask> blocking_ipv6: blocking_ipv6 || DEFAULT_BLOCKING_IPV6,
<mask> processingGetConfig: false,
<mask> };
<mask> },
<mask>
<mask> [actions.setDnsConfigRequest]: state => ({ ...state, processingSetConfig: true }),
<mask> [actions.setDnsConfigFailure]: state =>
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove [actions.getDnsSettingsRequest]: state => ({ ...state, processingDnsSettings: true }),
[actions.getDnsSettingsFailure]: state => ({ ...state, processingDnsSettings: false }),
[actions.getDnsSettingsSuccess]: (state, { payload }) => {
const {
upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
} = payload;
return {
...state,
allServers,
upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
processingDnsSettings: false,
};
},
</s> add </s> remove [actions.setUpstreamRequest]: state => ({ ...state, processingSetUpstream: true }),
[actions.setUpstreamFailure]: state => ({ ...state, processingSetUpstream: false }),
[actions.setUpstreamSuccess]: (state, { payload }) => ({
...state,
...payload,
processingSetUpstream: false,
}),
</s> add </s> remove [actions.handleUpstreamChange]: (state, { payload }) => {
const { upstreamDns } = payload;
return { ...state, upstreamDns };
},
</s> add </s> remove upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
allServers,
</s> add </s> remove submitting || invalid || processingSetUpstream || processingTestUpstream
</s> add submitting || invalid || processingSetConfig || processingTestUpstream </s> remove upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
</s> add upstream_dns,
bootstrap_dns, | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/reducers/dnsConfig.js |
keep keep keep keep replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> const newSetting = { ...setting, enabled: !setting.enabled };
<mask> const newSettingsList = { ...settingsList, [settingKey]: newSetting };
<mask> return { ...state, settingsList: newSettingsList };
<mask> },
<mask> [actions.setUpstreamRequest]: state => ({ ...state, processingSetUpstream: true }),
<mask> [actions.setUpstreamFailure]: state => ({ ...state, processingSetUpstream: false }),
<mask> [actions.setUpstreamSuccess]: (state, { payload }) => ({
<mask> ...state,
<mask> ...payload,
<mask> processingSetUpstream: false,
<mask> }),
<mask>
<mask> [actions.testUpstreamRequest]: state => ({ ...state, processingTestUpstream: true }),
<mask> [actions.testUpstreamFailure]: state => ({ ...state, processingTestUpstream: false }),
<mask> [actions.testUpstreamSuccess]: state => ({ ...state, processingTestUpstream: false }),
<mask> },
<mask> {
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove [actions.getDnsSettingsRequest]: state => ({ ...state, processingDnsSettings: true }),
[actions.getDnsSettingsFailure]: state => ({ ...state, processingDnsSettings: false }),
[actions.getDnsSettingsSuccess]: (state, { payload }) => {
const {
upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
} = payload;
return {
...state,
allServers,
upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
processingDnsSettings: false,
};
},
</s> add </s> add upstream_dns: (upstream_dns && upstream_dns.join('\n')) || '',
bootstrap_dns: (bootstrap_dns && bootstrap_dns.join('\n')) || '', </s> remove [actions.handleUpstreamChange]: (state, { payload }) => {
const { upstreamDns } = payload;
return { ...state, upstreamDns };
},
</s> add </s> remove processingSetUpstream: false,
</s> add </s> remove }) => (
</s> add }) => </s> add upstream_dns,
bootstrap_dns, | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/reducers/index.js |
keep keep keep keep replace keep keep keep keep keep | <mask> },
<mask> {
<mask> processing: true,
<mask> processingTestUpstream: false,
<mask> processingSetUpstream: false,
<mask> processingDhcpStatus: false,
<mask> settingsList: {},
<mask> },
<mask> );
<mask>
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove processingDnsSettings: true,
</s> add </s> remove upstreamDns: '',
bootstrapDns: '',
allServers: false,
</s> add </s> remove [actions.setUpstreamRequest]: state => ({ ...state, processingSetUpstream: true }),
[actions.setUpstreamFailure]: state => ({ ...state, processingSetUpstream: false }),
[actions.setUpstreamSuccess]: (state, { payload }) => ({
...state,
...payload,
processingSetUpstream: false,
}),
</s> add </s> add language, </s> remove upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
allServers,
</s> add </s> add upstream_dns: (upstream_dns && upstream_dns.join('\n')) || '',
bootstrap_dns: (bootstrap_dns && bootstrap_dns.join('\n')) || '', | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/reducers/index.js |
keep keep keep keep replace replace replace keep replace keep | <mask> const {
<mask> version,
<mask> dns_port: dnsPort,
<mask> dns_addresses: dnsAddresses,
<mask> upstream_dns: upstreamDns,
<mask> bootstrap_dns: bootstrapDns,
<mask> all_servers: allServers,
<mask> protection_enabled: protectionEnabled,
<mask> language,
<mask> http_port: httpPort,
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> add language, </s> remove upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
allServers,
</s> add </s> remove upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
</s> add upstream_dns,
bootstrap_dns, </s> remove disabled={!upstreamDns || processingTestUpstream}
</s> add disabled={!upstream_dns || processingTestUpstream} </s> remove [actions.getDnsSettingsRequest]: state => ({ ...state, processingDnsSettings: true }),
[actions.getDnsSettingsFailure]: state => ({ ...state, processingDnsSettings: false }),
[actions.getDnsSettingsSuccess]: (state, { payload }) => {
const {
upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
} = payload;
return {
...state,
allServers,
upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
processingDnsSettings: false,
};
},
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/reducers/index.js |
keep keep keep add keep keep keep keep keep | <mask> dns_port: dnsPort,
<mask> dns_addresses: dnsAddresses,
<mask> protection_enabled: protectionEnabled,
<mask> http_port: httpPort,
<mask> } = payload;
<mask> const newState = {
<mask> ...state,
<mask> isCoreRunning: true,
<mask> processing: false,
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
</s> add </s> remove language,
</s> add </s> remove upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
allServers,
</s> add </s> remove processingDnsSettings: true,
</s> add </s> remove processingSetUpstream: false,
</s> add </s> remove [actions.handleUpstreamChange]: (state, { payload }) => {
const { upstreamDns } = payload;
return { ...state, upstreamDns };
},
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/reducers/index.js |
keep keep keep keep replace replace replace keep keep keep keep keep | <mask> processing: false,
<mask> dnsVersion: version,
<mask> dnsPort,
<mask> dnsAddresses,
<mask> upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
<mask> bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
<mask> allServers,
<mask> protectionEnabled,
<mask> language,
<mask> httpPort,
<mask> };
<mask> return newState;
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove [actions.getDnsSettingsRequest]: state => ({ ...state, processingDnsSettings: true }),
[actions.getDnsSettingsFailure]: state => ({ ...state, processingDnsSettings: false }),
[actions.getDnsSettingsSuccess]: (state, { payload }) => {
const {
upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
} = payload;
return {
...state,
allServers,
upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
processingDnsSettings: false,
};
},
</s> add </s> add language, </s> add upstream_dns: (upstream_dns && upstream_dns.join('\n')) || '',
bootstrap_dns: (bootstrap_dns && bootstrap_dns.join('\n')) || '', </s> remove upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
</s> add </s> remove processingDnsSettings: true,
</s> add </s> remove upstreamDns: '',
bootstrapDns: '',
allServers: false,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/reducers/index.js |
keep keep keep keep replace replace replace replace replace keep keep keep keep keep | <mask> };
<mask> return newState;
<mask> },
<mask>
<mask> [actions.handleUpstreamChange]: (state, { payload }) => {
<mask> const { upstreamDns } = payload;
<mask> return { ...state, upstreamDns };
<mask> },
<mask>
<mask> [actions.getLanguageSuccess]: (state, { payload }) => {
<mask> const newState = { ...state, language: payload };
<mask> return newState;
<mask> },
<mask>
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove [actions.getDnsSettingsRequest]: state => ({ ...state, processingDnsSettings: true }),
[actions.getDnsSettingsFailure]: state => ({ ...state, processingDnsSettings: false }),
[actions.getDnsSettingsSuccess]: (state, { payload }) => {
const {
upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
} = payload;
return {
...state,
allServers,
upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
processingDnsSettings: false,
};
},
</s> add </s> remove [actions.setUpstreamRequest]: state => ({ ...state, processingSetUpstream: true }),
[actions.setUpstreamFailure]: state => ({ ...state, processingSetUpstream: false }),
[actions.setUpstreamSuccess]: (state, { payload }) => ({
...state,
...payload,
processingSetUpstream: false,
}),
</s> add </s> add upstream_dns,
bootstrap_dns, </s> remove setUpstream(url) {
const { path, method } = this.GLOBAL_SET_UPSTREAM_DNS;
const config = {
data: url,
headers: { 'Content-Type': 'application/json' },
};
return this.makeRequest(path, method, config);
}
</s> add </s> remove upstreamDns,
bootstrapDns,
allServers,
</s> add upstream_dns,
bootstrap_dns,
fastest_addr,
parallel_requests, </s> remove const upstreamDns = selector(state, 'upstream_dns');
const bootstrapDns = selector(state, 'bootstrap_dns');
const allServers = selector(state, 'all_servers');
</s> add const upstream_dns = selector(state, 'upstream_dns');
const bootstrap_dns = selector(state, 'bootstrap_dns');
const fastest_addr = selector(state, 'fastest_addr');
const parallel_requests = selector(state, 'parallel_requests');
| https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/reducers/index.js |
keep keep keep keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep keep keep | <mask> };
<mask> return newState;
<mask> },
<mask>
<mask> [actions.getDnsSettingsRequest]: state => ({ ...state, processingDnsSettings: true }),
<mask> [actions.getDnsSettingsFailure]: state => ({ ...state, processingDnsSettings: false }),
<mask> [actions.getDnsSettingsSuccess]: (state, { payload }) => {
<mask> const {
<mask> upstream_dns: upstreamDns,
<mask> bootstrap_dns: bootstrapDns,
<mask> all_servers: allServers,
<mask> } = payload;
<mask>
<mask> return {
<mask> ...state,
<mask> allServers,
<mask> upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
<mask> bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
<mask> processingDnsSettings: false,
<mask> };
<mask> },
<mask>
<mask> [actions.getProfileRequest]: state => ({ ...state, processingProfile: true }),
<mask> [actions.getProfileFailure]: state => ({ ...state, processingProfile: false }),
<mask> [actions.getProfileSuccess]: (state, { payload }) => ({
<mask> ...state,
<mask> name: payload.name,
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove [actions.setUpstreamRequest]: state => ({ ...state, processingSetUpstream: true }),
[actions.setUpstreamFailure]: state => ({ ...state, processingSetUpstream: false }),
[actions.setUpstreamSuccess]: (state, { payload }) => ({
...state,
...payload,
processingSetUpstream: false,
}),
</s> add </s> add upstream_dns: (upstream_dns && upstream_dns.join('\n')) || '',
bootstrap_dns: (bootstrap_dns && bootstrap_dns.join('\n')) || '', </s> remove [actions.handleUpstreamChange]: (state, { payload }) => {
const { upstreamDns } = payload;
return { ...state, upstreamDns };
},
</s> add </s> remove upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
allServers,
</s> add </s> remove language,
</s> add </s> remove processingDnsSettings: true,
</s> add | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/reducers/index.js |
keep replace keep replace replace replace keep keep keep keep | <mask> processingUpdate: false,
<mask> processingDnsSettings: true,
<mask> processingProfile: true,
<mask> upstreamDns: '',
<mask> bootstrapDns: '',
<mask> allServers: false,
<mask> protectionEnabled: false,
<mask> processingProtection: false,
<mask> httpPort: 80,
<mask> dnsPort: 53,
</s> + client: add fastest_addr setting
Squashed commit of the following:
commit e47fae25f7bac950bfb452fc8f18b9c0865b08ba
Merge: a23285ec e2ddc82d
Author: Simon Zolin <[email protected]>
Date: Wed Apr 22 19:16:01 2020 +0300
Merge remote-tracking branch 'origin/master' into 715
commit a23285ec3ace78fe4ce19122a51ecf3e6cdd942c
Author: ArtemBaskal <[email protected]>
Date: Wed Apr 22 18:30:30 2020 +0300
Review changes
commit f80d62a0d2038ff9d070ae9e9c77c33b92232d9c
Author: ArtemBaskal <[email protected]>
Date: Tue Apr 21 16:37:42 2020 +0300
+ client: Add fastest addr option
commit 9e713df80c5bf113c98794c0a20915c756a76938
Merge: e3bf4037 9b7c1181
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 16:02:03 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit e3bf4037f49198e42bde55305d6f9077341b556a
Author: Simon Zolin <[email protected]>
Date: Tue Apr 21 15:40:49 2020 +0300
minor
commit d6e6a823c5e51acc061b2850d362772efcb827e1
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 17:56:24 2020 +0300
* API changes
. removed POST /set_upstreams_config
. removed fields from GET /status: bootstrap_dns, upstream_dns, all_servers
. added new fields to /dns_config and /dns_info
commit 237a452d09cc48ff8f00e81c7fd35e7828bea835
Author: Simon Zolin <[email protected]>
Date: Fri Apr 17 16:43:13 2020 +0300
* API: /dns_info, /dns_config: add "parallel_requests" instead of "all_servers" from /set_upstreams_config
commit 9976723b9725ed19e0cce152d1d1198b13c4acc1
Author: Simon Zolin <[email protected]>
Date: Mon Mar 23 10:28:25 2020 +0300
openapi
commit 6f8ea16c6332606f29095b0094d71e8a91798f82
Merge: 36e4d4e8 c8285c41
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 19:18:48 2020 +0300
Merge remote-tracking branch 'origin/master' into 715-fastest-addr
commit 36e4d4e82cadeaba5a11313f0d69d66a0924c342
Author: Simon Zolin <[email protected]>
Date: Fri Mar 20 18:13:43 2020 +0300
+ DNS: add fastest_addr setting </s> remove processingSetUpstream: false,
</s> add </s> remove upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
allServers,
</s> add </s> remove [actions.getDnsSettingsRequest]: state => ({ ...state, processingDnsSettings: true }),
[actions.getDnsSettingsFailure]: state => ({ ...state, processingDnsSettings: false }),
[actions.getDnsSettingsSuccess]: (state, { payload }) => {
const {
upstream_dns: upstreamDns,
bootstrap_dns: bootstrapDns,
all_servers: allServers,
} = payload;
return {
...state,
allServers,
upstreamDns: (upstreamDns && upstreamDns.join('\n')) || '',
bootstrapDns: (bootstrapDns && bootstrapDns.join('\n')) || '',
processingDnsSettings: false,
};
},
</s> add </s> add upstream_dns: (upstream_dns && upstream_dns.join('\n')) || '',
bootstrap_dns: (bootstrap_dns && bootstrap_dns.join('\n')) || '', </s> add language, | https://github.com/AdguardTeam/AdGuardHome/commit/0ffc0965dc38eb02a09c7a14a8fc8f821cfb0893 | client/src/reducers/index.js |
keep add keep keep keep keep keep | <mask> formatTime,
<mask> formatDateTime,
<mask> } from '../../helpers/helpers';
<mask> import { SERVICES, FILTERED_STATUS, TABLE_DEFAULT_PAGE_SIZE } from '../../helpers/constants';
<mask> import { getTrackerData } from '../../helpers/trackers/trackers';
<mask> import { formatClientCell } from '../../helpers/formatClientCell';
<mask>
</s> + client: show date in query logs </s> add export const formatTodayDate = (dateTime) => {
const currentLanguage = i18n.languages[0] || 'en';
const parsedTime = dateParse(dateTime);
const options = {
year: 'numeric',
month: 'numeric',
day: 'numeric',
hour12: false,
};
return parsedTime.toLocaleString(currentLanguage, options);
};
</s> remove maxWidth: 100,
</s> add minWidth: 105, </s> remove <div className="logs__row">
<span className="logs__text" title={formatDateTime(value)}>
{formatTime(value)}
</span>
</div>
</s> add <div className="logs__row">
<span className="logs__text" title={formatDateTime(value)}>
{formatTodayDate(value) === formatTodayDate(Date.now())
? formatTime(value) : formatDateTime(value)}
</span>
</div> | https://github.com/AdguardTeam/AdGuardHome/commit/108cf73a307f248b1dbc9cb943c75a1adf431f0a | client/src/components/Logs/index.js |
keep keep keep keep replace replace replace replace replace keep keep keep keep keep | <mask>
<mask> checkWhiteList = reason => reason === FILTERED_STATUS.NOT_FILTERED_WHITE_LIST;
<mask>
<mask> getTimeCell = ({ value }) => (
<mask> <div className="logs__row">
<mask> <span className="logs__text" title={formatDateTime(value)}>
<mask> {formatTime(value)}
<mask> </span>
<mask> </div>
<mask> );
<mask>
<mask> getDomainCell = (row) => {
<mask> const response = row.value;
<mask> const trackerData = getTrackerData(response);
</s> + client: show date in query logs </s> add export const formatTodayDate = (dateTime) => {
const currentLanguage = i18n.languages[0] || 'en';
const parsedTime = dateParse(dateTime);
const options = {
year: 'numeric',
month: 'numeric',
day: 'numeric',
hour12: false,
};
return parsedTime.toLocaleString(currentLanguage, options);
};
</s> remove maxWidth: 100,
</s> add minWidth: 105, </s> add formatTodayDate, | https://github.com/AdguardTeam/AdGuardHome/commit/108cf73a307f248b1dbc9cb943c75a1adf431f0a | client/src/components/Logs/index.js |
keep keep keep keep replace keep keep keep keep keep | <mask> const columns = [
<mask> {
<mask> Header: t('time_table_header'),
<mask> accessor: 'time',
<mask> maxWidth: 100,
<mask> Cell: this.getTimeCell,
<mask> },
<mask> {
<mask> Header: t('domain_name_table_header'),
<mask> accessor: 'domain',
</s> + client: show date in query logs </s> add export const formatTodayDate = (dateTime) => {
const currentLanguage = i18n.languages[0] || 'en';
const parsedTime = dateParse(dateTime);
const options = {
year: 'numeric',
month: 'numeric',
day: 'numeric',
hour12: false,
};
return parsedTime.toLocaleString(currentLanguage, options);
};
</s> remove <div className="logs__row">
<span className="logs__text" title={formatDateTime(value)}>
{formatTime(value)}
</span>
</div>
</s> add <div className="logs__row">
<span className="logs__text" title={formatDateTime(value)}>
{formatTodayDate(value) === formatTodayDate(Date.now())
? formatTime(value) : formatDateTime(value)}
</span>
</div> </s> add formatTodayDate, | https://github.com/AdguardTeam/AdGuardHome/commit/108cf73a307f248b1dbc9cb943c75a1adf431f0a | client/src/components/Logs/index.js |
keep add keep keep keep keep keep keep | <mask> };
<mask>
<mask> export const normalizeLogs = logs => logs.map((log) => {
<mask> const {
<mask> time,
<mask> question,
<mask> answer: response,
<mask> reason,
</s> + client: show date in query logs </s> remove maxWidth: 100,
</s> add minWidth: 105, </s> remove <div className="logs__row">
<span className="logs__text" title={formatDateTime(value)}>
{formatTime(value)}
</span>
</div>
</s> add <div className="logs__row">
<span className="logs__text" title={formatDateTime(value)}>
{formatTodayDate(value) === formatTodayDate(Date.now())
? formatTime(value) : formatDateTime(value)}
</span>
</div> </s> add formatTodayDate, | https://github.com/AdguardTeam/AdGuardHome/commit/108cf73a307f248b1dbc9cb943c75a1adf431f0a | client/src/helpers/helpers.js |
keep keep keep replace keep keep keep keep keep | <mask> 'name': 'build'
<mask>
<mask> 'env':
<mask> 'GO_VERSION': '1.19.7'
<mask> 'NODE_VERSION': '14'
<mask>
<mask> 'on':
<mask> 'push':
<mask> 'branches':
</s> Pull request 1801: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 4d6abc98329c794b5ea3f67447dd69ea8b60205c
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 5 16:07:29 2023 +0300
all: upd go, tools, i18n </s> remove 'GO_VERSION': '1.19.7'
</s> add 'GO_VERSION': '1.19.8' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove golang.org/x/vuln v0.0.0-20230325131008-9550759f8614 h1:ioRvkxpf+3iq9xvzP6AWjaBuROUad9SmjLr0QWBzxKw=
golang.org/x/vuln v0.0.0-20230325131008-9550759f8614/go.mod h1:64LpnL2PuSMzFYeCmJjYiRbroOUG9aCZYznINnF5PHE=
</s> add golang.org/x/vuln v0.0.0-20230404205743-41aec7335792 h1:NybXXIgk5dslpSHRStwyfI74htFvi9Cyk3mCr9ubE2I=
golang.org/x/vuln v0.0.0-20230404205743-41aec7335792/go.mod h1:8gQW8OCBfaUiPaWAPDQf/9V1w+ymmmB/05SwB/EXZNs= </s> remove golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
</s> add golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= | https://github.com/AdguardTeam/AdGuardHome/commit/10bffd89c9954d51f12d6ad1da39cf6e61f029a8 | .github/workflows/build.yml |
keep keep keep replace keep keep keep keep keep | <mask> 'name': 'lint'
<mask>
<mask> 'env':
<mask> 'GO_VERSION': '1.19.7'
<mask>
<mask> 'on':
<mask> 'push':
<mask> 'tags':
<mask> - 'v*'
</s> Pull request 1801: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 4d6abc98329c794b5ea3f67447dd69ea8b60205c
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 5 16:07:29 2023 +0300
all: upd go, tools, i18n </s> remove 'GO_VERSION': '1.19.7'
</s> add 'GO_VERSION': '1.19.8' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove golang.org/x/vuln v0.0.0-20230325131008-9550759f8614 h1:ioRvkxpf+3iq9xvzP6AWjaBuROUad9SmjLr0QWBzxKw=
golang.org/x/vuln v0.0.0-20230325131008-9550759f8614/go.mod h1:64LpnL2PuSMzFYeCmJjYiRbroOUG9aCZYznINnF5PHE=
</s> add golang.org/x/vuln v0.0.0-20230404205743-41aec7335792 h1:NybXXIgk5dslpSHRStwyfI74htFvi9Cyk3mCr9ubE2I=
golang.org/x/vuln v0.0.0-20230404205743-41aec7335792/go.mod h1:8gQW8OCBfaUiPaWAPDQf/9V1w+ymmmB/05SwB/EXZNs= </s> remove golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | https://github.com/AdguardTeam/AdGuardHome/commit/10bffd89c9954d51f12d6ad1da39cf6e61f029a8 | .github/workflows/lint.yml |
keep keep keep keep replace keep keep keep keep keep | <mask> 'name': 'AdGuard Home - Build and publish release'
<mask> # Make sure to sync any changes with the branch overrides below.
<mask> 'variables':
<mask> 'channel': 'edge'
<mask> 'dockerGo': 'adguard/golang-ubuntu:6.2'
<mask>
<mask> 'stages':
<mask> - 'Build frontend':
<mask> 'manual': false
<mask> 'final': false
</s> Pull request 1801: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 4d6abc98329c794b5ea3f67447dd69ea8b60205c
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 5 16:07:29 2023 +0300
all: upd go, tools, i18n </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove 'GO_VERSION': '1.19.7'
</s> add 'GO_VERSION': '1.19.8' </s> remove 'GO_VERSION': '1.19.7'
</s> add 'GO_VERSION': '1.19.8' </s> remove golang.org/x/vuln v0.0.0-20230325131008-9550759f8614 h1:ioRvkxpf+3iq9xvzP6AWjaBuROUad9SmjLr0QWBzxKw=
golang.org/x/vuln v0.0.0-20230325131008-9550759f8614/go.mod h1:64LpnL2PuSMzFYeCmJjYiRbroOUG9aCZYznINnF5PHE=
</s> add golang.org/x/vuln v0.0.0-20230404205743-41aec7335792 h1:NybXXIgk5dslpSHRStwyfI74htFvi9Cyk3mCr9ubE2I=
golang.org/x/vuln v0.0.0-20230404205743-41aec7335792/go.mod h1:8gQW8OCBfaUiPaWAPDQf/9V1w+ymmmB/05SwB/EXZNs= | https://github.com/AdguardTeam/AdGuardHome/commit/10bffd89c9954d51f12d6ad1da39cf6e61f029a8 | bamboo-specs/release.yaml |
keep keep keep keep replace keep keep keep keep keep | <mask> # Set the default release channel on the release branch to beta, as we may
<mask> # need to build a few of these.
<mask> 'variables':
<mask> 'channel': 'beta'
<mask> 'dockerGo': 'adguard/golang-ubuntu:6.2'
<mask> # release-vX.Y.Z branches are the branches from which the actual final release
<mask> # is built.
<mask> - '^release-v[0-9]+\.[0-9]+\.[0-9]+':
<mask> # Disable integration branches for release branches.
<mask> 'branch-config':
</s> Pull request 1801: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 4d6abc98329c794b5ea3f67447dd69ea8b60205c
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 5 16:07:29 2023 +0300
all: upd go, tools, i18n </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove 'GO_VERSION': '1.19.7'
</s> add 'GO_VERSION': '1.19.8' </s> remove golang.org/x/vuln v0.0.0-20230325131008-9550759f8614 h1:ioRvkxpf+3iq9xvzP6AWjaBuROUad9SmjLr0QWBzxKw=
golang.org/x/vuln v0.0.0-20230325131008-9550759f8614/go.mod h1:64LpnL2PuSMzFYeCmJjYiRbroOUG9aCZYznINnF5PHE=
</s> add golang.org/x/vuln v0.0.0-20230404205743-41aec7335792 h1:NybXXIgk5dslpSHRStwyfI74htFvi9Cyk3mCr9ubE2I=
golang.org/x/vuln v0.0.0-20230404205743-41aec7335792/go.mod h1:8gQW8OCBfaUiPaWAPDQf/9V1w+ymmmB/05SwB/EXZNs= </s> remove golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= | https://github.com/AdguardTeam/AdGuardHome/commit/10bffd89c9954d51f12d6ad1da39cf6e61f029a8 | bamboo-specs/release.yaml |
keep keep keep keep replace | <mask> # Set the default release channel on the final branch to release, as these
<mask> # are the ones that actually get released.
<mask> 'variables':
<mask> 'channel': 'release'
<mask> 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> Pull request 1801: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 4d6abc98329c794b5ea3f67447dd69ea8b60205c
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 5 16:07:29 2023 +0300
all: upd go, tools, i18n </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove golang.org/x/vuln v0.0.0-20230325131008-9550759f8614 h1:ioRvkxpf+3iq9xvzP6AWjaBuROUad9SmjLr0QWBzxKw=
golang.org/x/vuln v0.0.0-20230325131008-9550759f8614/go.mod h1:64LpnL2PuSMzFYeCmJjYiRbroOUG9aCZYznINnF5PHE=
</s> add golang.org/x/vuln v0.0.0-20230404205743-41aec7335792 h1:NybXXIgk5dslpSHRStwyfI74htFvi9Cyk3mCr9ubE2I=
golang.org/x/vuln v0.0.0-20230404205743-41aec7335792/go.mod h1:8gQW8OCBfaUiPaWAPDQf/9V1w+ymmmB/05SwB/EXZNs= </s> remove golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
</s> add golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= | https://github.com/AdguardTeam/AdGuardHome/commit/10bffd89c9954d51f12d6ad1da39cf6e61f029a8 | bamboo-specs/release.yaml |
keep keep keep keep replace keep keep keep keep keep | <mask> 'project-key': 'AGH'
<mask> 'key': 'AHBRTSPECS'
<mask> 'name': 'AdGuard Home - Build and run tests'
<mask> 'variables':
<mask> 'dockerGo': 'adguard/golang-ubuntu:6.2'
<mask>
<mask> 'stages':
<mask> - 'Tests':
<mask> 'manual': false
<mask> 'final': false
</s> Pull request 1801: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 4d6abc98329c794b5ea3f67447dd69ea8b60205c
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 5 16:07:29 2023 +0300
all: upd go, tools, i18n </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove 'GO_VERSION': '1.19.7'
</s> add 'GO_VERSION': '1.19.8' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' </s> remove 'GO_VERSION': '1.19.7'
</s> add 'GO_VERSION': '1.19.8' </s> remove golang.org/x/vuln v0.0.0-20230325131008-9550759f8614 h1:ioRvkxpf+3iq9xvzP6AWjaBuROUad9SmjLr0QWBzxKw=
golang.org/x/vuln v0.0.0-20230325131008-9550759f8614/go.mod h1:64LpnL2PuSMzFYeCmJjYiRbroOUG9aCZYznINnF5PHE=
</s> add golang.org/x/vuln v0.0.0-20230404205743-41aec7335792 h1:NybXXIgk5dslpSHRStwyfI74htFvi9Cyk3mCr9ubE2I=
golang.org/x/vuln v0.0.0-20230404205743-41aec7335792/go.mod h1:8gQW8OCBfaUiPaWAPDQf/9V1w+ymmmB/05SwB/EXZNs= | https://github.com/AdguardTeam/AdGuardHome/commit/10bffd89c9954d51f12d6ad1da39cf6e61f029a8 | bamboo-specs/test.yaml |
keep keep keep keep replace keep keep keep keep keep | <mask> github.com/kisielk/errcheck v1.6.3
<mask> github.com/kyoh86/looppointer v0.2.1
<mask> github.com/securego/gosec/v2 v2.15.0
<mask> golang.org/x/tools v0.7.0
<mask> golang.org/x/vuln v0.0.0-20230325131008-9550759f8614
<mask> honnef.co/go/tools v0.4.3
<mask> mvdan.cc/gofumpt v0.4.0
<mask> mvdan.cc/unparam v0.0.0-20230312165513-e84e2d14e3b8
<mask> )
<mask>
</s> Pull request 1801: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 4d6abc98329c794b5ea3f67447dd69ea8b60205c
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 5 16:07:29 2023 +0300
all: upd go, tools, i18n </s> remove golang.org/x/vuln v0.0.0-20230325131008-9550759f8614 h1:ioRvkxpf+3iq9xvzP6AWjaBuROUad9SmjLr0QWBzxKw=
golang.org/x/vuln v0.0.0-20230325131008-9550759f8614/go.mod h1:64LpnL2PuSMzFYeCmJjYiRbroOUG9aCZYznINnF5PHE=
</s> add golang.org/x/vuln v0.0.0-20230404205743-41aec7335792 h1:NybXXIgk5dslpSHRStwyfI74htFvi9Cyk3mCr9ubE2I=
golang.org/x/vuln v0.0.0-20230404205743-41aec7335792/go.mod h1:8gQW8OCBfaUiPaWAPDQf/9V1w+ymmmB/05SwB/EXZNs= </s> remove golang.org/x/sys v0.6.0 // indirect
</s> add golang.org/x/sys v0.7.0 // indirect </s> remove golang.org/x/mod v0.9.0 // indirect
</s> add golang.org/x/mod v0.10.0 // indirect </s> remove golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
</s> add golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' | https://github.com/AdguardTeam/AdGuardHome/commit/10bffd89c9954d51f12d6ad1da39cf6e61f029a8 | internal/tools/go.mod |
keep keep replace keep replace | <mask> golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
<mask> golang.org/x/exp/typeparams v0.0.0-20230321023759-10a507213a29 // indirect
<mask> golang.org/x/mod v0.9.0 // indirect
<mask> golang.org/x/sync v0.1.0 // indirect
<mask> golang.org/x/sys v0.6.0 // indirect
</s> Pull request 1801: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 4d6abc98329c794b5ea3f67447dd69ea8b60205c
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 5 16:07:29 2023 +0300
all: upd go, tools, i18n </s> remove golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
</s> add golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> remove golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/vuln v0.0.0-20230325131008-9550759f8614 h1:ioRvkxpf+3iq9xvzP6AWjaBuROUad9SmjLr0QWBzxKw=
golang.org/x/vuln v0.0.0-20230325131008-9550759f8614/go.mod h1:64LpnL2PuSMzFYeCmJjYiRbroOUG9aCZYznINnF5PHE=
</s> add golang.org/x/vuln v0.0.0-20230404205743-41aec7335792 h1:NybXXIgk5dslpSHRStwyfI74htFvi9Cyk3mCr9ubE2I=
golang.org/x/vuln v0.0.0-20230404205743-41aec7335792/go.mod h1:8gQW8OCBfaUiPaWAPDQf/9V1w+ymmmB/05SwB/EXZNs= </s> remove golang.org/x/vuln v0.0.0-20230325131008-9550759f8614
</s> add golang.org/x/vuln v0.0.0-20230404205743-41aec7335792 </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' | https://github.com/AdguardTeam/AdGuardHome/commit/10bffd89c9954d51f12d6ad1da39cf6e61f029a8 | internal/tools/go.mod |
keep keep keep keep replace replace keep keep keep keep keep | <mask> golang.org/x/exp/typeparams v0.0.0-20230321023759-10a507213a29/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
<mask> golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
<mask> golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
<mask> golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
<mask> golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
<mask> golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
<mask> golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
<mask> golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
<mask> golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
<mask> golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
</s> Pull request 1801: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 4d6abc98329c794b5ea3f67447dd69ea8b60205c
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 5 16:07:29 2023 +0300
all: upd go, tools, i18n </s> remove golang.org/x/mod v0.9.0 // indirect
</s> add golang.org/x/mod v0.10.0 // indirect </s> remove golang.org/x/sys v0.6.0 // indirect
</s> add golang.org/x/sys v0.7.0 // indirect </s> remove golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/vuln v0.0.0-20230325131008-9550759f8614 h1:ioRvkxpf+3iq9xvzP6AWjaBuROUad9SmjLr0QWBzxKw=
golang.org/x/vuln v0.0.0-20230325131008-9550759f8614/go.mod h1:64LpnL2PuSMzFYeCmJjYiRbroOUG9aCZYznINnF5PHE=
</s> add golang.org/x/vuln v0.0.0-20230404205743-41aec7335792 h1:NybXXIgk5dslpSHRStwyfI74htFvi9Cyk3mCr9ubE2I=
golang.org/x/vuln v0.0.0-20230404205743-41aec7335792/go.mod h1:8gQW8OCBfaUiPaWAPDQf/9V1w+ymmmB/05SwB/EXZNs= </s> remove golang.org/x/vuln v0.0.0-20230325131008-9550759f8614
</s> add golang.org/x/vuln v0.0.0-20230404205743-41aec7335792 </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' | https://github.com/AdguardTeam/AdGuardHome/commit/10bffd89c9954d51f12d6ad1da39cf6e61f029a8 | internal/tools/go.sum |
keep keep keep keep replace replace keep keep keep keep keep | <mask> golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
<mask> golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
<mask> golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
<mask> golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
<mask> golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
<mask> golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
<mask> golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
<mask> golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
</s> Pull request 1801: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 4d6abc98329c794b5ea3f67447dd69ea8b60205c
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 5 16:07:29 2023 +0300
all: upd go, tools, i18n </s> remove golang.org/x/sys v0.6.0 // indirect
</s> add golang.org/x/sys v0.7.0 // indirect </s> remove golang.org/x/mod v0.9.0 // indirect
</s> add golang.org/x/mod v0.10.0 // indirect </s> remove golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
</s> add golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> remove golang.org/x/vuln v0.0.0-20230325131008-9550759f8614 h1:ioRvkxpf+3iq9xvzP6AWjaBuROUad9SmjLr0QWBzxKw=
golang.org/x/vuln v0.0.0-20230325131008-9550759f8614/go.mod h1:64LpnL2PuSMzFYeCmJjYiRbroOUG9aCZYznINnF5PHE=
</s> add golang.org/x/vuln v0.0.0-20230404205743-41aec7335792 h1:NybXXIgk5dslpSHRStwyfI74htFvi9Cyk3mCr9ubE2I=
golang.org/x/vuln v0.0.0-20230404205743-41aec7335792/go.mod h1:8gQW8OCBfaUiPaWAPDQf/9V1w+ymmmB/05SwB/EXZNs= </s> remove golang.org/x/vuln v0.0.0-20230325131008-9550759f8614
</s> add golang.org/x/vuln v0.0.0-20230404205743-41aec7335792 </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' | https://github.com/AdguardTeam/AdGuardHome/commit/10bffd89c9954d51f12d6ad1da39cf6e61f029a8 | internal/tools/go.sum |
keep keep keep keep replace replace keep keep keep keep keep | <mask> golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
<mask> golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
<mask> golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
<mask> golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
<mask> golang.org/x/vuln v0.0.0-20230325131008-9550759f8614 h1:ioRvkxpf+3iq9xvzP6AWjaBuROUad9SmjLr0QWBzxKw=
<mask> golang.org/x/vuln v0.0.0-20230325131008-9550759f8614/go.mod h1:64LpnL2PuSMzFYeCmJjYiRbroOUG9aCZYznINnF5PHE=
<mask> golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
<mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
<mask> gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
</s> Pull request 1801: upd-go
Merge in DNS/adguard-home from upd-go to master
Squashed commit of the following:
commit 4d6abc98329c794b5ea3f67447dd69ea8b60205c
Author: Ainar Garipov <[email protected]>
Date: Wed Apr 5 16:07:29 2023 +0300
all: upd go, tools, i18n </s> remove golang.org/x/vuln v0.0.0-20230325131008-9550759f8614
</s> add golang.org/x/vuln v0.0.0-20230404205743-41aec7335792 </s> remove golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
</s> add golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= </s> remove golang.org/x/sys v0.6.0 // indirect
</s> add golang.org/x/sys v0.7.0 // indirect </s> remove golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
</s> add golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= </s> remove golang.org/x/mod v0.9.0 // indirect
</s> add golang.org/x/mod v0.10.0 // indirect </s> remove 'dockerGo': 'adguard/golang-ubuntu:6.2'
</s> add 'dockerGo': 'adguard/golang-ubuntu:6.3' | https://github.com/AdguardTeam/AdGuardHome/commit/10bffd89c9954d51f12d6ad1da39cf6e61f029a8 | internal/tools/go.sum |
keep keep keep keep replace replace replace replace keep replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace replace keep keep keep | <mask> var regexRules = []string{"/example\\.org/", "@@||test.example.org^"}
<mask> var maskRules = []string{"test*.example.org^", "exam*.com"}
<mask>
<mask> var tests = []struct {
<mask> testname string
<mask> rules []string
<mask> hostname string
<mask> result bool
<mask> }{
<mask> {"sanity", []string{"||doubleclick.net^"}, "www.doubleclick.net", true},
<mask> {"sanity", []string{"||doubleclick.net^"}, "nodoubleclick.net", false},
<mask> {"sanity", []string{"||doubleclick.net^"}, "doubleclick.net.ru", false},
<mask> {"sanity", []string{"||doubleclick.net^"}, "wmconvirus.narod.ru", false},
<mask> {"blocking", blockingRules, "example.org", true},
<mask> {"blocking", blockingRules, "test.example.org", true},
<mask> {"blocking", blockingRules, "test.test.example.org", true},
<mask> {"blocking", blockingRules, "testexample.org", false},
<mask> {"blocking", blockingRules, "onemoreexample.org", false},
<mask> {"whitelist", whitelistRules, "example.org", true},
<mask> {"whitelist", whitelistRules, "test.example.org", false},
<mask> {"whitelist", whitelistRules, "test.test.example.org", false},
<mask> {"whitelist", whitelistRules, "testexample.org", false},
<mask> {"whitelist", whitelistRules, "onemoreexample.org", false},
<mask> {"important", importantRules, "example.org", false},
<mask> {"important", importantRules, "test.example.org", true},
<mask> {"important", importantRules, "test.test.example.org", true},
<mask> {"important", importantRules, "testexample.org", false},
<mask> {"important", importantRules, "onemoreexample.org", false},
<mask> {"regex", regexRules, "example.org", true},
<mask> {"regex", regexRules, "test.example.org", false},
<mask> {"regex", regexRules, "test.test.example.org", false},
<mask> {"regex", regexRules, "testexample.org", true},
<mask> {"regex", regexRules, "onemoreexample.org", true},
<mask> {"mask", maskRules, "test.example.org", true},
<mask> {"mask", maskRules, "test2.example.org", true},
<mask> {"mask", maskRules, "example.com", true},
<mask> {"mask", maskRules, "exampleeee.com", true},
<mask> {"mask", maskRules, "onemoreexamsite.com", true},
<mask> {"mask", maskRules, "example.org", false},
<mask> {"mask", maskRules, "testexample.org", false},
<mask> {"mask", maskRules, "example.co.uk", false},
<mask> }
<mask>
<mask> func TestMatching(t *testing.T) {
</s> dnsfilter -- Update tests to check for expected filter/nofilter reason as well. </s> remove if ret.IsFiltered != test.result {
t.Errorf("Hostname %s has wrong result (%v must be %v)", test.hostname, ret, test.result)
</s> add if ret.IsFiltered != test.isFiltered {
t.Errorf("Hostname %s has wrong result (%v must be %v)", test.hostname, ret.IsFiltered, test.isFiltered)
}
if ret.Reason != test.reason {
t.Errorf("Hostname %s has wrong reason (%v must be %v)", test.hostname, ret.Reason.String(), test.reason.String()) | https://github.com/AdguardTeam/AdGuardHome/commit/1102963fa09bb5708dfd9bff9449ffd303a47701 | dnsfilter/dnsfilter_test.go |
keep keep keep keep replace replace keep keep keep keep keep | <mask> ret, err := d.CheckHost(test.hostname)
<mask> if err != nil {
<mask> t.Errorf("Error while matching host %s: %s", test.hostname, err)
<mask> }
<mask> if ret.IsFiltered != test.result {
<mask> t.Errorf("Hostname %s has wrong result (%v must be %v)", test.hostname, ret, test.result)
<mask> }
<mask> })
<mask> }
<mask> }
<mask>
</s> dnsfilter -- Update tests to check for expected filter/nofilter reason as well. </s> remove {"sanity", []string{"||doubleclick.net^"}, "www.doubleclick.net", true},
{"sanity", []string{"||doubleclick.net^"}, "nodoubleclick.net", false},
{"sanity", []string{"||doubleclick.net^"}, "doubleclick.net.ru", false},
{"sanity", []string{"||doubleclick.net^"}, "wmconvirus.narod.ru", false},
{"blocking", blockingRules, "example.org", true},
{"blocking", blockingRules, "test.example.org", true},
{"blocking", blockingRules, "test.test.example.org", true},
{"blocking", blockingRules, "testexample.org", false},
{"blocking", blockingRules, "onemoreexample.org", false},
{"whitelist", whitelistRules, "example.org", true},
{"whitelist", whitelistRules, "test.example.org", false},
{"whitelist", whitelistRules, "test.test.example.org", false},
{"whitelist", whitelistRules, "testexample.org", false},
{"whitelist", whitelistRules, "onemoreexample.org", false},
{"important", importantRules, "example.org", false},
{"important", importantRules, "test.example.org", true},
{"important", importantRules, "test.test.example.org", true},
{"important", importantRules, "testexample.org", false},
{"important", importantRules, "onemoreexample.org", false},
{"regex", regexRules, "example.org", true},
{"regex", regexRules, "test.example.org", false},
{"regex", regexRules, "test.test.example.org", false},
{"regex", regexRules, "testexample.org", true},
{"regex", regexRules, "onemoreexample.org", true},
{"mask", maskRules, "test.example.org", true},
{"mask", maskRules, "test2.example.org", true},
{"mask", maskRules, "example.com", true},
{"mask", maskRules, "exampleeee.com", true},
{"mask", maskRules, "onemoreexamsite.com", true},
{"mask", maskRules, "example.org", false},
{"mask", maskRules, "testexample.org", false},
{"mask", maskRules, "example.co.uk", false},
</s> add {"sanity", []string{"||doubleclick.net^"}, "www.doubleclick.net", true, FilteredBlackList},
{"sanity", []string{"||doubleclick.net^"}, "nodoubleclick.net", false, NotFilteredNotFound},
{"sanity", []string{"||doubleclick.net^"}, "doubleclick.net.ru", false, NotFilteredNotFound},
{"sanity", []string{"||doubleclick.net^"}, "wmconvirus.narod.ru", false, NotFilteredNotFound},
{"blocking", blockingRules, "example.org", true, FilteredBlackList},
{"blocking", blockingRules, "test.example.org", true, FilteredBlackList},
{"blocking", blockingRules, "test.test.example.org", true, FilteredBlackList},
{"blocking", blockingRules, "testexample.org", false, NotFilteredNotFound},
{"blocking", blockingRules, "onemoreexample.org", false, NotFilteredNotFound},
{"whitelist", whitelistRules, "example.org", true, FilteredBlackList},
{"whitelist", whitelistRules, "test.example.org", false, NotFilteredWhiteList},
{"whitelist", whitelistRules, "test.test.example.org", false, NotFilteredWhiteList},
{"whitelist", whitelistRules, "testexample.org", false, NotFilteredNotFound},
{"whitelist", whitelistRules, "onemoreexample.org", false, NotFilteredNotFound},
{"important", importantRules, "example.org", false, NotFilteredWhiteList},
{"important", importantRules, "test.example.org", true, FilteredBlackList},
{"important", importantRules, "test.test.example.org", true, FilteredBlackList},
{"important", importantRules, "testexample.org", false, NotFilteredNotFound},
{"important", importantRules, "onemoreexample.org", false, NotFilteredNotFound},
{"regex", regexRules, "example.org", true, FilteredBlackList},
{"regex", regexRules, "test.example.org", false, NotFilteredWhiteList},
{"regex", regexRules, "test.test.example.org", false, NotFilteredWhiteList},
{"regex", regexRules, "testexample.org", true, FilteredBlackList},
{"regex", regexRules, "onemoreexample.org", true, FilteredBlackList},
{"mask", maskRules, "test.example.org", true, FilteredBlackList},
{"mask", maskRules, "test2.example.org", true, FilteredBlackList},
{"mask", maskRules, "example.com", true, FilteredBlackList},
{"mask", maskRules, "exampleeee.com", true, FilteredBlackList},
{"mask", maskRules, "onemoreexamsite.com", true, FilteredBlackList},
{"mask", maskRules, "example.org", false, NotFilteredNotFound},
{"mask", maskRules, "testexample.org", false, NotFilteredNotFound},
{"mask", maskRules, "example.co.uk", false, NotFilteredNotFound}, </s> remove testname string
rules []string
hostname string
result bool
</s> add testname string
rules []string
hostname string
isFiltered bool
reason Reason | https://github.com/AdguardTeam/AdGuardHome/commit/1102963fa09bb5708dfd9bff9449ffd303a47701 | dnsfilter/dnsfilter_test.go |
keep add keep keep keep keep keep keep | <mask> "net/url"
<mask> "strconv"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghstrings"
<mask> "github.com/AdguardTeam/golibs/jsonutil"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "golang.org/x/net/idna"
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> add "golang.org/x/net/idna" </s> remove return c.ctDomainOrClientCaseStrict(term, clientID, name, host, ip)
</s> add return ctDomainOrClientCaseStrict(c.value, c.asciiVal, clientID, name, host, ip) </s> remove func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (ok bool, sc searchCriterion, err error) {
</s> add func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (
ok bool,
sc searchCriterion,
err error,
) { </s> remove if len(val) == 0 {
return false, searchCriterion{}, nil
</s> add if val == "" {
return false, sc, nil
}
strict := getDoubleQuotesEnclosedValue(&val)
var asciiVal string
switch ct {
case ctTerm:
// Decode lowercased value from punycode to make EqualFold and
// friends work properly with IDNAs.
//
// TODO(e.burkov): Make it work with parts of IDNAs somehow.
loweredVal := strings.ToLower(val)
if asciiVal, err = idna.ToASCII(loweredVal); err != nil {
log.Debug("can't convert %q to ascii: %s", val, err)
} else if asciiVal == loweredVal {
// Purge asciiVal to prevent checking the same value
// twice.
asciiVal = ""
}
case ctFilteringStatus:
if !aghstrings.InSlice(filteringStatusValues, val) {
return false, sc, fmt.Errorf("invalid value %s", val)
}
default:
return false, sc, fmt.Errorf(
"invalid criterion type %v: should be one of %v",
ct,
[]criterionType{ctTerm, ctFilteringStatus},
) </s> remove c := searchCriterion{
</s> add sc = searchCriterion{ </s> remove }
if getDoubleQuotesEnclosedValue(&c.value) {
c.strict = true
</s> add asciiVal: asciiVal,
strict: strict, | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/http.go |
keep keep add keep keep keep keep | <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghstrings"
<mask> "github.com/AdguardTeam/golibs/jsonutil"
<mask> "github.com/AdguardTeam/golibs/log"
<mask> )
<mask>
<mask> type qlogConfig struct {
<mask> Enabled bool `json:"enabled"`
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> add "strings" </s> add asciiVal string </s> remove return c.ctDomainOrClientCaseNonStrict(term, clientID, name, host, ip)
</s> add return ctDomainOrClientCaseNonStrict(c.value, c.asciiVal, clientID, name, host, ip) </s> remove ok, c, err = l.parseSearchCriterion(q, k, v)
</s> add ok, c, err = l.parseSearchCriterion(q, v.urlField, v.ct) </s> remove paramNames := map[string]criterionType{
"search": ctTerm,
"response_status": ctFilteringStatus,
}
for k, v := range paramNames {
</s> add for _, v := range []struct {
urlField string
ct criterionType
}{{
urlField: "search",
ct: ctTerm,
}, {
urlField: "response_status",
ct: ctFilteringStatus,
}} { </s> remove if len(val) == 0 {
return false, searchCriterion{}, nil
</s> add if val == "" {
return false, sc, nil
}
strict := getDoubleQuotesEnclosedValue(&val)
var asciiVal string
switch ct {
case ctTerm:
// Decode lowercased value from punycode to make EqualFold and
// friends work properly with IDNAs.
//
// TODO(e.burkov): Make it work with parts of IDNAs somehow.
loweredVal := strings.ToLower(val)
if asciiVal, err = idna.ToASCII(loweredVal); err != nil {
log.Debug("can't convert %q to ascii: %s", val, err)
} else if asciiVal == loweredVal {
// Purge asciiVal to prevent checking the same value
// twice.
asciiVal = ""
}
case ctFilteringStatus:
if !aghstrings.InSlice(filteringStatusValues, val) {
return false, sc, fmt.Errorf("invalid value %s", val)
}
default:
return false, sc, fmt.Errorf(
"invalid criterion type %v: should be one of %v",
ct,
[]criterionType{ctTerm, ctFilteringStatus},
) | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/http.go |
keep keep keep replace keep keep keep keep keep keep keep keep replace replace keep keep | <mask> }
<mask>
<mask> // parseSearchCriterion parses a search criterion from the query parameter.
<mask> func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (ok bool, sc searchCriterion, err error) {
<mask> val := q.Get(name)
<mask> if len(val) == 0 {
<mask> return false, searchCriterion{}, nil
<mask> }
<mask>
<mask> // parseSearchCriterion parses a search criterion from the query parameter.
<mask> func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (ok bool, sc searchCriterion, err error) {
<mask> val := q.Get(name)
<mask> if len(val) == 0 {
<mask> return false, searchCriterion{}, nil
<mask> }
<mask>
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> remove if ct == ctFilteringStatus && !aghstrings.InSlice(filteringStatusValues, c.value) {
return false, c, fmt.Errorf("invalid value %s", c.value)
}
return true, c, nil
</s> add return true, sc, nil </s> remove c := searchCriterion{
</s> add sc = searchCriterion{ </s> add asciiVal string </s> remove }
if getDoubleQuotesEnclosedValue(&c.value) {
c.strict = true
</s> add asciiVal: asciiVal,
strict: strict, </s> remove paramNames := map[string]criterionType{
"search": ctTerm,
"response_status": ctFilteringStatus,
}
for k, v := range paramNames {
</s> add for _, v := range []struct {
urlField string
ct criterionType
}{{
urlField: "search",
ct: ctTerm,
}, {
urlField: "response_status",
ct: ctFilteringStatus,
}} { | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/http.go |
keep keep replace keep keep replace replace replace | <mask> }
<mask>
<mask> c := searchCriterion{
<mask> criterionType: ct,
<mask> value: val,
<mask> }
<mask> if getDoubleQuotesEnclosedValue(&c.value) {
<mask> c.strict = true
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> remove if len(val) == 0 {
return false, searchCriterion{}, nil
</s> add if val == "" {
return false, sc, nil
}
strict := getDoubleQuotesEnclosedValue(&val)
var asciiVal string
switch ct {
case ctTerm:
// Decode lowercased value from punycode to make EqualFold and
// friends work properly with IDNAs.
//
// TODO(e.burkov): Make it work with parts of IDNAs somehow.
loweredVal := strings.ToLower(val)
if asciiVal, err = idna.ToASCII(loweredVal); err != nil {
log.Debug("can't convert %q to ascii: %s", val, err)
} else if asciiVal == loweredVal {
// Purge asciiVal to prevent checking the same value
// twice.
asciiVal = ""
}
case ctFilteringStatus:
if !aghstrings.InSlice(filteringStatusValues, val) {
return false, sc, fmt.Errorf("invalid value %s", val)
}
default:
return false, sc, fmt.Errorf(
"invalid criterion type %v: should be one of %v",
ct,
[]criterionType{ctTerm, ctFilteringStatus},
) </s> remove if ct == ctFilteringStatus && !aghstrings.InSlice(filteringStatusValues, c.value) {
return false, c, fmt.Errorf("invalid value %s", c.value)
}
return true, c, nil
</s> add return true, sc, nil </s> remove ok, c, err = l.parseSearchCriterion(q, k, v)
</s> add ok, c, err = l.parseSearchCriterion(q, v.urlField, v.ct) </s> remove term := strings.ToLower(c.value)
</s> add </s> remove paramNames := map[string]criterionType{
"search": ctTerm,
"response_status": ctFilteringStatus,
}
for k, v := range paramNames {
</s> add for _, v := range []struct {
urlField string
ct criterionType
}{{
urlField: "search",
ct: ctTerm,
}, {
urlField: "response_status",
ct: ctFilteringStatus,
}} { | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/http.go |
keep keep keep keep replace replace replace replace replace keep keep keep keep keep | <mask> if getDoubleQuotesEnclosedValue(&c.value) {
<mask> c.strict = true
<mask> }
<mask>
<mask> if ct == ctFilteringStatus && !aghstrings.InSlice(filteringStatusValues, c.value) {
<mask> return false, c, fmt.Errorf("invalid value %s", c.value)
<mask> }
<mask>
<mask> return true, c, nil
<mask> }
<mask>
<mask> // parseSearchParams - parses "searchParams" from the HTTP request's query string
<mask> func (l *queryLog) parseSearchParams(r *http.Request) (p *searchParams, err error) {
<mask> p = newSearchParams()
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> remove }
if getDoubleQuotesEnclosedValue(&c.value) {
c.strict = true
</s> add asciiVal: asciiVal,
strict: strict, </s> remove func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (ok bool, sc searchCriterion, err error) {
</s> add func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (
ok bool,
sc searchCriterion,
err error,
) { </s> remove if len(val) == 0 {
return false, searchCriterion{}, nil
</s> add if val == "" {
return false, sc, nil
}
strict := getDoubleQuotesEnclosedValue(&val)
var asciiVal string
switch ct {
case ctTerm:
// Decode lowercased value from punycode to make EqualFold and
// friends work properly with IDNAs.
//
// TODO(e.burkov): Make it work with parts of IDNAs somehow.
loweredVal := strings.ToLower(val)
if asciiVal, err = idna.ToASCII(loweredVal); err != nil {
log.Debug("can't convert %q to ascii: %s", val, err)
} else if asciiVal == loweredVal {
// Purge asciiVal to prevent checking the same value
// twice.
asciiVal = ""
}
case ctFilteringStatus:
if !aghstrings.InSlice(filteringStatusValues, val) {
return false, sc, fmt.Errorf("invalid value %s", val)
}
default:
return false, sc, fmt.Errorf(
"invalid criterion type %v: should be one of %v",
ct,
[]criterionType{ctTerm, ctFilteringStatus},
) </s> remove c := searchCriterion{
</s> add sc = searchCriterion{ </s> remove ok, c, err = l.parseSearchCriterion(q, k, v)
</s> add ok, c, err = l.parseSearchCriterion(q, v.urlField, v.ct) </s> remove paramNames := map[string]criterionType{
"search": ctTerm,
"response_status": ctFilteringStatus,
}
for k, v := range paramNames {
</s> add for _, v := range []struct {
urlField string
ct criterionType
}{{
urlField: "search",
ct: ctTerm,
}, {
urlField: "response_status",
ct: ctFilteringStatus,
}} { | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/http.go |
keep replace replace replace replace replace replace keep keep replace | <mask>
<mask> paramNames := map[string]criterionType{
<mask> "search": ctTerm,
<mask> "response_status": ctFilteringStatus,
<mask> }
<mask>
<mask> for k, v := range paramNames {
<mask> var ok bool
<mask> var c searchCriterion
<mask> ok, c, err = l.parseSearchCriterion(q, k, v)
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> remove }
if getDoubleQuotesEnclosedValue(&c.value) {
c.strict = true
</s> add asciiVal: asciiVal,
strict: strict, </s> remove if len(val) == 0 {
return false, searchCriterion{}, nil
</s> add if val == "" {
return false, sc, nil
}
strict := getDoubleQuotesEnclosedValue(&val)
var asciiVal string
switch ct {
case ctTerm:
// Decode lowercased value from punycode to make EqualFold and
// friends work properly with IDNAs.
//
// TODO(e.burkov): Make it work with parts of IDNAs somehow.
loweredVal := strings.ToLower(val)
if asciiVal, err = idna.ToASCII(loweredVal); err != nil {
log.Debug("can't convert %q to ascii: %s", val, err)
} else if asciiVal == loweredVal {
// Purge asciiVal to prevent checking the same value
// twice.
asciiVal = ""
}
case ctFilteringStatus:
if !aghstrings.InSlice(filteringStatusValues, val) {
return false, sc, fmt.Errorf("invalid value %s", val)
}
default:
return false, sc, fmt.Errorf(
"invalid criterion type %v: should be one of %v",
ct,
[]criterionType{ctTerm, ctFilteringStatus},
) </s> remove func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (ok bool, sc searchCriterion, err error) {
</s> add func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (
ok bool,
sc searchCriterion,
err error,
) { </s> remove c := searchCriterion{
</s> add sc = searchCriterion{ </s> remove if ct == ctFilteringStatus && !aghstrings.InSlice(filteringStatusValues, c.value) {
return false, c, fmt.Errorf("invalid value %s", c.value)
}
return true, c, nil
</s> add return true, sc, nil | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/http.go |
keep keep keep keep replace replace replace replace keep keep keep keep keep | <mask>
<mask> type criterionType int
<mask>
<mask> const (
<mask> // ctTerm is for searching by the domain name, the client's IP
<mask> // address, the client's ID or the client's name.
<mask> //
<mask> // TODO(e.burkov): Make it support IDNA while #3012.
<mask> ctTerm criterionType = iota
<mask> // ctFilteringStatus is for searching by the filtering status.
<mask> //
<mask> // See (*searchCriterion).ctFilteringStatusCase for details.
<mask> ctFilteringStatus
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> add asciiVal string </s> remove paramNames := map[string]criterionType{
"search": ctTerm,
"response_status": ctFilteringStatus,
}
for k, v := range paramNames {
</s> add for _, v := range []struct {
urlField string
ct criterionType
}{{
urlField: "search",
ct: ctTerm,
}, {
urlField: "response_status",
ct: ctFilteringStatus,
}} { </s> remove if len(val) == 0 {
return false, searchCriterion{}, nil
</s> add if val == "" {
return false, sc, nil
}
strict := getDoubleQuotesEnclosedValue(&val)
var asciiVal string
switch ct {
case ctTerm:
// Decode lowercased value from punycode to make EqualFold and
// friends work properly with IDNAs.
//
// TODO(e.burkov): Make it work with parts of IDNAs somehow.
loweredVal := strings.ToLower(val)
if asciiVal, err = idna.ToASCII(loweredVal); err != nil {
log.Debug("can't convert %q to ascii: %s", val, err)
} else if asciiVal == loweredVal {
// Purge asciiVal to prevent checking the same value
// twice.
asciiVal = ""
}
case ctFilteringStatus:
if !aghstrings.InSlice(filteringStatusValues, val) {
return false, sc, fmt.Errorf("invalid value %s", val)
}
default:
return false, sc, fmt.Errorf(
"invalid criterion type %v: should be one of %v",
ct,
[]criterionType{ctTerm, ctFilteringStatus},
) </s> remove if ct == ctFilteringStatus && !aghstrings.InSlice(filteringStatusValues, c.value) {
return false, c, fmt.Errorf("invalid value %s", c.value)
}
return true, c, nil
</s> add return true, sc, nil </s> add (asciiTerm != "" && containsFold(host, asciiTerm)) || </s> remove func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (ok bool, sc searchCriterion, err error) {
</s> add func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (
ok bool,
sc searchCriterion,
err error,
) { | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/searchcriterion.go |
keep keep keep add keep keep keep keep keep keep | <mask>
<mask> // searchCriterion is a search criterion that is used to match a record.
<mask> type searchCriterion struct {
<mask> value string
<mask> criterionType criterionType
<mask> // strict, if true, means that the criterion must be applied to the
<mask> // whole value rather than the part of it. That is, equality and not
<mask> // containment.
<mask> strict bool
<mask> }
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> remove if len(val) == 0 {
return false, searchCriterion{}, nil
</s> add if val == "" {
return false, sc, nil
}
strict := getDoubleQuotesEnclosedValue(&val)
var asciiVal string
switch ct {
case ctTerm:
// Decode lowercased value from punycode to make EqualFold and
// friends work properly with IDNAs.
//
// TODO(e.burkov): Make it work with parts of IDNAs somehow.
loweredVal := strings.ToLower(val)
if asciiVal, err = idna.ToASCII(loweredVal); err != nil {
log.Debug("can't convert %q to ascii: %s", val, err)
} else if asciiVal == loweredVal {
// Purge asciiVal to prevent checking the same value
// twice.
asciiVal = ""
}
case ctFilteringStatus:
if !aghstrings.InSlice(filteringStatusValues, val) {
return false, sc, fmt.Errorf("invalid value %s", val)
}
default:
return false, sc, fmt.Errorf(
"invalid criterion type %v: should be one of %v",
ct,
[]criterionType{ctTerm, ctFilteringStatus},
) </s> remove // ctTerm is for searching by the domain name, the client's IP
// address, the client's ID or the client's name.
//
// TODO(e.burkov): Make it support IDNA while #3012.
</s> add // ctTerm is for searching by the domain name, the client's IP address,
// the client's ID or the client's name. The domain name search
// supports IDNAs. </s> remove if ct == ctFilteringStatus && !aghstrings.InSlice(filteringStatusValues, c.value) {
return false, c, fmt.Errorf("invalid value %s", c.value)
}
return true, c, nil
</s> add return true, sc, nil </s> remove func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (ok bool, sc searchCriterion, err error) {
</s> add func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (
ok bool,
sc searchCriterion,
err error,
) { </s> remove paramNames := map[string]criterionType{
"search": ctTerm,
"response_status": ctFilteringStatus,
}
for k, v := range paramNames {
</s> add for _, v := range []struct {
urlField string
ct criterionType
}{{
urlField: "search",
ct: ctTerm,
}, {
urlField: "response_status",
ct: ctFilteringStatus,
}} { </s> remove }
if getDoubleQuotesEnclosedValue(&c.value) {
c.strict = true
</s> add asciiVal: asciiVal,
strict: strict, | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/searchcriterion.go |
keep keep keep keep replace keep keep keep keep keep | <mask> // containment.
<mask> strict bool
<mask> }
<mask>
<mask> func (c *searchCriterion) ctDomainOrClientCaseStrict(
<mask> term string,
<mask> clientID string,
<mask> name string,
<mask> host string,
<mask> ip string,
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> remove func (c *searchCriterion) ctDomainOrClientCaseNonStrict(
</s> add func ctDomainOrClientCaseNonStrict( </s> add asciiTerm string, </s> add asciiTerm string, </s> add (asciiTerm != "" && strings.EqualFold(host, asciiTerm)) || </s> remove func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (ok bool, sc searchCriterion, err error) {
</s> add func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (
ok bool,
sc searchCriterion,
err error,
) { </s> remove return c.ctDomainOrClientCaseNonStrict(term, clientID, name, host, ip)
</s> add return ctDomainOrClientCaseNonStrict(c.value, c.asciiVal, clientID, name, host, ip) | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/searchcriterion.go |
keep add keep keep keep keep keep | <mask> func ctDomainOrClientCaseStrict(
<mask> term string,
<mask> clientID string,
<mask> name string,
<mask> host string,
<mask> ip string,
<mask> ) (ok bool) {
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> add asciiTerm string, </s> remove func (c *searchCriterion) ctDomainOrClientCaseStrict(
</s> add func ctDomainOrClientCaseStrict( </s> remove func (c *searchCriterion) ctDomainOrClientCaseNonStrict(
</s> add func ctDomainOrClientCaseNonStrict( </s> add (asciiTerm != "" && strings.EqualFold(host, asciiTerm)) || </s> remove func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (ok bool, sc searchCriterion, err error) {
</s> add func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (
ok bool,
sc searchCriterion,
err error,
) { </s> add (asciiTerm != "" && containsFold(host, asciiTerm)) || | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/searchcriterion.go |
keep keep keep add keep keep keep keep keep | <mask> host string,
<mask> ip string,
<mask> ) (ok bool) {
<mask> return strings.EqualFold(host, term) ||
<mask> strings.EqualFold(clientID, term) ||
<mask> strings.EqualFold(ip, term) ||
<mask> strings.EqualFold(name, term)
<mask> }
<mask>
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> add (asciiTerm != "" && containsFold(host, asciiTerm)) || </s> add asciiTerm string, </s> add asciiTerm string, </s> remove func (c *searchCriterion) ctDomainOrClientCaseNonStrict(
</s> add func ctDomainOrClientCaseNonStrict( </s> remove func (c *searchCriterion) ctDomainOrClientCaseStrict(
</s> add func ctDomainOrClientCaseStrict( </s> remove func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (ok bool, sc searchCriterion, err error) {
</s> add func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (
ok bool,
sc searchCriterion,
err error,
) { | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/searchcriterion.go |
keep keep keep keep replace keep keep keep keep keep | <mask>
<mask> return false
<mask> }
<mask>
<mask> func (c *searchCriterion) ctDomainOrClientCaseNonStrict(
<mask> term string,
<mask> clientID string,
<mask> name string,
<mask> host string,
<mask> ip string,
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> remove func (c *searchCriterion) ctDomainOrClientCaseStrict(
</s> add func ctDomainOrClientCaseStrict( </s> add asciiTerm string, </s> add asciiTerm string, </s> add (asciiTerm != "" && strings.EqualFold(host, asciiTerm)) || </s> remove func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (ok bool, sc searchCriterion, err error) {
</s> add func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (
ok bool,
sc searchCriterion,
err error,
) { </s> remove return c.ctDomainOrClientCaseNonStrict(term, clientID, name, host, ip)
</s> add return ctDomainOrClientCaseNonStrict(c.value, c.asciiVal, clientID, name, host, ip) | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/searchcriterion.go |
keep keep keep add keep keep keep keep keep | <mask> }
<mask>
<mask> func ctDomainOrClientCaseNonStrict(
<mask> term string,
<mask> clientID string,
<mask> name string,
<mask> host string,
<mask> ip string,
<mask> ) (ok bool) {
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> add asciiTerm string, </s> remove func (c *searchCriterion) ctDomainOrClientCaseNonStrict(
</s> add func ctDomainOrClientCaseNonStrict( </s> remove func (c *searchCriterion) ctDomainOrClientCaseStrict(
</s> add func ctDomainOrClientCaseStrict( </s> add (asciiTerm != "" && strings.EqualFold(host, asciiTerm)) || </s> remove func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (ok bool, sc searchCriterion, err error) {
</s> add func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (
ok bool,
sc searchCriterion,
err error,
) { </s> add (asciiTerm != "" && containsFold(host, asciiTerm)) || | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/searchcriterion.go |
keep keep add keep keep keep keep keep | <mask> ) (ok bool) {
<mask> return containsFold(clientID, term) ||
<mask> containsFold(host, term) ||
<mask> containsFold(ip, term) ||
<mask> containsFold(name, term)
<mask> }
<mask>
<mask> // quickMatch quickly checks if the line matches the given search criterion.
</s> Pull request: 3012 idna search
Merge in DNS/adguard-home from 3012-idna-search to master
Closes #3012.
Squashed commit of the following:
commit 6a9fbfe16860df5db5982a70cfbf040967b6e6ae
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:28:10 2021 +0300
querylog: add todo
commit 31292ba1aeb9e91ff4f6abae7ffdf806a87cae66
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:21:46 2021 +0300
querylog: imp docs, code
commit 35757f76837cb8034f6079a351d01aa4706bfea7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 21:01:08 2021 +0300
queerylog: fix idn case match
commit eecfc98b6449c5c7c5a23602e80e47002034bc25
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:32:00 2021 +0300
querylog: imp code, docs
commit 8aa6242fe92a9c2daa674b976595b13be96b0cf7
Author: Eugene Burkov <[email protected]>
Date: Tue Jun 29 20:00:54 2021 +0300
querylog: sup idn search </s> add (asciiTerm != "" && strings.EqualFold(host, asciiTerm)) || </s> remove func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (ok bool, sc searchCriterion, err error) {
</s> add func (l *queryLog) parseSearchCriterion(q url.Values, name string, ct criterionType) (
ok bool,
sc searchCriterion,
err error,
) { </s> add asciiVal string </s> remove if len(val) == 0 {
return false, searchCriterion{}, nil
</s> add if val == "" {
return false, sc, nil
}
strict := getDoubleQuotesEnclosedValue(&val)
var asciiVal string
switch ct {
case ctTerm:
// Decode lowercased value from punycode to make EqualFold and
// friends work properly with IDNAs.
//
// TODO(e.burkov): Make it work with parts of IDNAs somehow.
loweredVal := strings.ToLower(val)
if asciiVal, err = idna.ToASCII(loweredVal); err != nil {
log.Debug("can't convert %q to ascii: %s", val, err)
} else if asciiVal == loweredVal {
// Purge asciiVal to prevent checking the same value
// twice.
asciiVal = ""
}
case ctFilteringStatus:
if !aghstrings.InSlice(filteringStatusValues, val) {
return false, sc, fmt.Errorf("invalid value %s", val)
}
default:
return false, sc, fmt.Errorf(
"invalid criterion type %v: should be one of %v",
ct,
[]criterionType{ctTerm, ctFilteringStatus},
) </s> add asciiTerm string, </s> remove return c.ctDomainOrClientCaseStrict(c.value, clientID, name, host, ip)
</s> add return ctDomainOrClientCaseStrict(
c.value,
c.asciiVal,
clientID,
name,
host,
ip,
) | https://github.com/AdguardTeam/AdGuardHome/commit/116bedd72716c9e5ef2f3b13673bcc74fc7c11b6 | internal/querylog/searchcriterion.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.