mirrors
/
AdGuardHome
mirror of https://github.com/AdguardTeam/AdGuardHome.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cherry-pick: 4166 udp upstream 

Merge in DNS/adguard-home from 4166-udp-upstream to master

Closes #4166.

Squashed commit of the following:

commit b8b6d1c7ac1e11e83c0c68e46e7f66fdc6043839
Merge: e5f01273 ea6e033d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Mar 1 20:36:40 2022 +0300

    Merge branch 'master' into 4166-udp-upstream

commit e5f0127384d84c4395da5b79a1fd4a47acbe122c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Mar 1 19:41:33 2022 +0300

    client: upd upstream examples

commit bd974f22231f11f4c57e19d6d13bc45dbfdf2fdf
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Tue Mar 1 18:36:10 2022 +0300

    all: upd proxy

commit badf1325090ecd1dc86e42e7406dfb6653e07bf1
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Feb 4 14:36:50 2022 +0300

    WIP
This commit is contained in:
Eugene Burkov 2022-03-02 14:21:33 +03:00 committed by Ainar Garipov
parent 6a4a9a0239
commit 941cd2a562
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/src/components/Settings/Dns/Upstream/Examples.js
View File

@ -10,6 +10,15 @@ const Examples = (props) => (
<li> <li>
<code>94.140.14.140</code>: {props.t('example_upstream_regular')} <code>94.140.14.140</code>: {props.t('example_upstream_regular')}
</li> </li>
<li>
<code>udp://dns-unfiltered.adguard.com</code>: <Trans>example_upstream_udp</Trans>
</li>
<li>
<code>tcp://94.140.14.140</code>: <Trans>example_upstream_tcp</Trans>
</li>
<li>
<code>tcp://dns-unfiltered.adguard.com</code>: <Trans>example_upstream_tcp_hostname</Trans>
</li>
<li> <li>
<code>tls://dns-unfiltered.adguard.com</code>: <code>tls://dns-unfiltered.adguard.com</code>:
<span> <span>
@ -67,9 +76,6 @@ const Examples = (props) => (
</Trans> </Trans>
</span> </span>
</li> </li>
<li>
<code>tcp://94.140.14.140</code>: <Trans>example_upstream_tcp</Trans>
</li>
<li> <li>
<code>sdns://...</code>: <code>sdns://...</code>:
<span> <span>

2
internal/dnsforward/http.go
View File

@ -404,7 +404,7 @@ func ValidateUpstreams(upstreams []string) (err error) {
return nil return nil
} }
var protocols = []string{"tls://", "https://", "tcp://", "sdns://", "quic://"} var protocols = []string{"udp://", "tcp://", "tls://", "https://", "sdns://", "quic://"}
func validateUpstream(u string) (useDefault bool, err error) { func validateUpstream(u string) (useDefault bool, err error) {
// Check if the user tries to specify upstream for domain. // Check if the user tries to specify upstream for domain.

8
internal/dnsforward/http_test.go
View File

@ -303,6 +303,14 @@ func TestValidateUpstream(t *testing.T) {
name: "valid_default", name: "valid_default",
upstream: "sdns://AQMAAAAAAAAAFDE3Ni4xMDMuMTMwLjEzMDo1NDQzINErR_JS3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczEuYWRndWFyZC5jb20", upstream: "sdns://AQMAAAAAAAAAFDE3Ni4xMDMuMTMwLjEzMDo1NDQzINErR_JS3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczEuYWRndWFyZC5jb20",
wantErr: ``, wantErr: ``,
}, {
wantDef: assert.True,
name: "default_udp_host",
upstream: "udp://dns.google",
}, {
wantDef: assert.True,
name: "default_udp_ip",
upstream: "udp://8.8.8.8",
}, { }, {
wantDef: assert.False, wantDef: assert.False,
name: "valid", name: "valid",