Skip to content

Commit

Permalink
Pull request: 4884 Upd golibs
Browse files Browse the repository at this point in the history
Merge in DNS/dnsproxy from 4884-upd-golibs to master

Updates AdguardTeam/AdGuardHome#4884.

Squashed commit of the following:

commit ecaf32c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Feb 17 18:57:00 2023 +0300

    all: fix vendor

commit 2cb6983
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Feb 17 18:54:17 2023 +0300

    all: fix go.mod

commit 24bb50d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Fri Feb 17 18:52:40 2023 +0300

    all: upd golibs
  • Loading branch information
EugeneOne1 committed Feb 20, 2023
1 parent 9a749e2 commit 74c86a9
Show file tree
Hide file tree
Showing 7 changed files with 240 additions and 62 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/AdguardTeam/dnsproxy
go 1.19

require (
github.com/AdguardTeam/golibs v0.11.4
github.com/AdguardTeam/golibs v0.12.0
github.com/ameshkov/dnscrypt/v2 v2.2.5
github.com/ameshkov/dnsstamps v1.0.3
github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github.com/AdguardTeam/golibs v0.11.4 h1:IltyvxwCTN+xxJF5sh6VadF8Zfbf8elgCm9dgijSVzM=
github.com/AdguardTeam/golibs v0.11.4/go.mod h1:87bN2x4VsTritptE3XZg9l8T6gznWsIxHBcQ1DeRIXA=
github.com/AdguardTeam/golibs v0.12.0 h1:z4Q3Mz0pHJ2Zag4B0RBaIXEUue1TPOKkbRiYkwC4r7I=
github.com/AdguardTeam/golibs v0.12.0/go.mod h1:87bN2x4VsTritptE3XZg9l8T6gznWsIxHBcQ1DeRIXA=
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY=
github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA=
github.com/aead/poly1305 v0.0.0-20180717145839-3fee0db0b635 h1:52m0LGchQBBVqJRyYYufQuIbVqRawmubW3OFGqK1ekw=
Expand Down
2 changes: 2 additions & 0 deletions proxy/upstreams_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ func TestGetUpstreamsForDomain(t *testing.T) {
"[/www.google.com//]1.2.3.4",
"[/maps.google.com/]#",
"[/www.google.com/]tls://1.1.1.1",
"[/_acme-challenge.example.org/]#",
}

config, err := ParseUpstreamsConfig(
Expand All @@ -31,6 +32,7 @@ func TestGetUpstreamsForDomain(t *testing.T) {
assertUpstreamsForDomain(t, config, "www2.google.com.", []string{"4.3.2.1:53"})
assertUpstreamsForDomain(t, config, "internal.local.", []string{"4.3.2.1:53"})
assertUpstreamsForDomain(t, config, "google.", []string{"1.2.3.4:53"})
assertUpstreamsForDomain(t, config, "_acme-challenge.example.org.", []string{})
assertUpstreamsForDomain(t, config, "maps.google.com.", []string{})
}

Expand Down
162 changes: 129 additions & 33 deletions vendor/github.com/AdguardTeam/golibs/netutil/addr.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 74c86a9

Please sign in to comment.