Murzaby/Adguardhome
1
0
Fork 0
mirror of https://github.com/AdguardTeam/AdGuardHome.git synced 2026-06-27 19:31:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

all: upd deps

Browse source
This commit is contained in:
Dimitry Kolyshev 2026-06-11 15:19:00 +07:00
parent 54e6e30022
commit bd4b6aa139
5 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
go.mod
View file

@ -3,11 +3,13 @@ module github.com/AdguardTeam/AdGuardHome
go 1.26.4
require (
github.com/AdguardTeam/dnsproxy v0.81.4
// TODO(d.kolyshev): !! Use tagged version.
github.com/AdguardTeam/dnscrypt v0.0.0-20260604031830-b5d331f13d41
// TODO(d.kolyshev): !! Use tagged version.
github.com/AdguardTeam/dnsproxy v0.81.5-0.20260611073630-aeb4e118016b
github.com/AdguardTeam/golibs v0.35.13
github.com/AdguardTeam/urlfilter v0.23.2
github.com/NYTimes/gziphandler v1.1.1
github.com/ameshkov/dnscrypt/v2 v2.4.0
github.com/bluele/gcache v0.0.2
github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500
github.com/digineo/go-ipset/v2 v2.2.1

8
go.sum
View file

@ -4,8 +4,10 @@ cloud.google.com/go/auth v0.20.0 h1:kXTssoVb4azsVDoUiF8KvxAqrsQcQtB53DcSgta74CA=
cloud.google.com/go/auth v0.20.0/go.mod h1:942/yi/itH1SsmpyrbnTMDgGfdy2BUqIKyd0cyYLc5Q=
cloud.google.com/go/compute/metadata v0.9.0 h1:pDUj4QMoPejqq20dK0Pg2N4yG9zIkYGdBtwLoEkH9Zs=
cloud.google.com/go/compute/metadata v0.9.0/go.mod h1:E0bWwX5wTnLPedCKqk3pJmVgCBSM6qQI1yTBdEb3C10=
github.com/AdguardTeam/dnsproxy v0.81.4 h1:eFM8wzA9sNcK473FdWiy1VRhbgpEM5KighAoJ48O31c=
github.com/AdguardTeam/dnsproxy v0.81.4/go.mod h1:q7Wiq4iiABAFn6EzPqDWhUbXeVcI5O+RvZH/hmXoAaI=
github.com/AdguardTeam/dnscrypt v0.0.0-20260604031830-b5d331f13d41 h1:KoVLunvh7vjlHc+2zIrqHdPQwX3cSCK2/GvyItB2S1M=
github.com/AdguardTeam/dnscrypt v0.0.0-20260604031830-b5d331f13d41/go.mod h1:IkFL0fJTuw4vkS9cM5LCUXnI1kaw+SmKaPRRlO8G3GU=
github.com/AdguardTeam/dnsproxy v0.81.5-0.20260611073630-aeb4e118016b h1:UscIdnqh7CLntAueDt0oqK8IRlPTmWip8Nrp4NRpV2w=
github.com/AdguardTeam/dnsproxy v0.81.5-0.20260611073630-aeb4e118016b/go.mod h1:zMMpvEqvYRuFy8md+sWAD+Jppfk5IX0QgZa0bdG6MWk=
github.com/AdguardTeam/golibs v0.35.13 h1:sflm5/sWhiGwUXNAZObiqVMkdg8HeYVFK2A0oJ27hbU=
github.com/AdguardTeam/golibs v0.35.13/go.mod h1:8EEGG4auTDd8HV3tBETXLkuxDH9lk9vvFbJn+wbmypg=
github.com/AdguardTeam/urlfilter v0.23.2 h1:EiS/PQZO/X2S6cduFW6BBoRLyjd6SqZj1ZiFbU1KaFE=
@ -16,8 +18,6 @@ github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1
github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c=
github.com/ameshkov/dnscrypt/v2 v2.4.0 h1:if6ZG2cuQmcP2TwSY+D0+8+xbPfoatufGlOQTMNkI9o=
github.com/ameshkov/dnscrypt/v2 v2.4.0/go.mod h1:WpEFV2uhebXb8Jhes/5/fSdpmhGV8TL22RDaeWwV6hI=
github.com/ameshkov/dnsstamps v1.0.3 h1:Srzik+J9mivH1alRACTbys2xOxs0lRH9qnTA7Y1OYVo=
github.com/ameshkov/dnsstamps v1.0.3/go.mod h1:Ii3eUu73dx4Vw5O4wjzmT5+lkCwovjzaEZZ4gKyIH5A=
github.com/anthropics/anthropic-sdk-go v1.26.0 h1:oUTzFaUpAevfuELAP1sjL6CQJ9HHAfT7CoSYSac11PY=

4
internal/dnsforward/config.go
View file

@ -19,6 +19,7 @@ import (
"github.com/AdguardTeam/AdGuardHome/internal/aghslog"
"github.com/AdguardTeam/AdGuardHome/internal/aghtls"
"github.com/AdguardTeam/AdGuardHome/internal/client"
"github.com/AdguardTeam/dnscrypt"
"github.com/AdguardTeam/dnsproxy/proxy"
"github.com/AdguardTeam/dnsproxy/ratelimit"
"github.com/AdguardTeam/dnsproxy/upstream"
@ -29,7 +30,6 @@ import (
"github.com/AdguardTeam/golibs/stringutil"
"github.com/AdguardTeam/golibs/timeutil"
"github.com/AdguardTeam/golibs/validate"
"github.com/ameshkov/dnscrypt/v2"
)
// Config represents the DNS filtering configuration of AdGuard Home. The zero
@ -221,7 +221,7 @@ type TLSConfig struct {
type DNSCryptConfig struct {
// ResolverCert is the certificate used for DNSCrypt connections. It is not
// nil if there is at least one UDP or TCP address present.
ResolverCert *dnscrypt.Cert
ResolverCert *dnscrypt.Certificate
// UDPListenAddrs are the addresses to listen on for DNSCrypt UDP
// connections.

2
internal/home/config.go
View file

@ -327,7 +327,7 @@ type tlsConfigSettings struct {
// if PortDNSCrypt is not zero.
//
// See https://github.com/AdguardTeam/dnsproxy and
// https://github.com/ameshkov/dnscrypt.
// https://github.com/AdguardTeam/dnscrypt.
DNSCryptConfigFile string `yaml:"dnscrypt_config_file" json:"dnscrypt_config_file"`
// CertificateChain is the PEM-encoded certificate chain. Must be empty if

4
internal/home/dns.go
View file

@ -21,12 +21,12 @@ import (
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
"github.com/AdguardTeam/AdGuardHome/internal/querylog"
"github.com/AdguardTeam/AdGuardHome/internal/stats"
"github.com/AdguardTeam/dnscrypt"
"github.com/AdguardTeam/golibs/errors"
"github.com/AdguardTeam/golibs/log"
"github.com/AdguardTeam/golibs/logutil/slogutil"
"github.com/AdguardTeam/golibs/netutil"
"github.com/AdguardTeam/golibs/netutil/urlutil"
"github.com/ameshkov/dnscrypt/v2"
yaml "go.yaml.in/yaml/v4"
)
@ -404,7 +404,7 @@ func newDNSCryptConfig(
return nil, fmt.Errorf("decoding dnscrypt config: %w", err)
}
cert, err := rc.CreateCert()
cert, err := rc.NewCert()
if err != nil {
return nil, fmt.Errorf("creating dnscrypt cert: %w", err)
}