public/AdGuardHome
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/AdGuardHome.git synced 2026-08-03 20:59:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pull request 2429: upd-all

Browse Source 
Merge in DNS/adguard-home from upd-all to master

Squashed commit of the following:

commit e5a492891caed1b340cca8086147184ac6447122
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Jun 26 19:08:24 2025 +0300

    all: upd dnsproxy

commit c9d224f1074352c0e9dd6f2961367565421403e7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Jun 26 19:01:51 2025 +0300

    all: upd chlog, deps
This commit is contained in:
Ainar Garipov
2025-06-26 19:21:50 +03:00
parent b05d0fdb93
commit e38d3a529a
5 changed files with 76 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/dnsforward/clientid.go
View File

@@ -11,7 +11,6 @@ import (
"github.com/AdguardTeam/dnsproxy/proxy"
"github.com/AdguardTeam/golibs/log"
"github.com/AdguardTeam/golibs/netutil"
"github.com/quic-go/quic-go"
)
// clientIDFromClientServerName extracts and validates a ClientID. hostSrvName
@@ -93,11 +92,6 @@ type tlsConn interface {
ConnectionState() (cs tls.ConnectionState)
}
// quicConnection is a narrow interface for quic.Connection to simplify testing.
type quicConnection interface {
ConnectionState() (cs quic.ConnectionState)
}
// clientServerName returns the TLS server name based on the protocol. For
// DNS-over-HTTPS requests, it will return the hostname part of the Host header
// if there is one.
@@ -116,13 +110,7 @@ func clientServerName(pctx *proxy.DNSContext, proto proxy.Proto) (srvName string
from = "host header"
}
case proxy.ProtoQUIC:
qConn := pctx.QUICConnection
conn, ok := qConn.(quicConnection)
if !ok {
return "", fmt.Errorf("pctx conn of proto %s is %T, want quic.Connection", proto, qConn)
}
srvName = conn.ConnectionState().TLS.ServerName
srvName = pctx.QUICConnection.ConnectionState().TLS.ServerName
case proxy.ProtoTLS:
conn := pctx.Conn
tc, ok := conn.(tlsConn)

32
internal/dnsforward/clientid_internal_test.go
View File

@@ -10,7 +10,6 @@ import (
"github.com/AdguardTeam/dnsproxy/proxy"
"github.com/AdguardTeam/golibs/logutil/slogutil"
"github.com/AdguardTeam/golibs/testutil"
"github.com/quic-go/quic-go"
"github.com/stretchr/testify/assert"
)
@@ -30,23 +29,6 @@ func (c testTLSConn) ConnectionState() (cs tls.ConnectionState) {
return cs
}
// testQUICConnection is a quicConnection for tests.
type testQUICConnection struct {
// Connection is embedded here simply to make testQUICConnection a
// quic.Connection without actually implementing all methods.
quic.Connection
serverName string
}
// ConnectionState implements the quicConnection interface for
// testQUICConnection.
func (c testQUICConnection) ConnectionState() (cs quic.ConnectionState) {
cs.TLS.ServerName = c.serverName
return cs
}
func TestServer_clientIDFromDNSContext(t *testing.T) {
testCases := []struct {
name string
@@ -224,7 +206,6 @@ func TestServer_clientIDFromDNSContext(t *testing.T) {
var (
conn net.Conn
qconn quic.Connection
httpReq *http.Request
)
@@ -232,9 +213,9 @@ func TestServer_clientIDFromDNSContext(t *testing.T) {
case proxy.ProtoHTTPS:
httpReq = newHTTPReq(tc.cliSrvName, tc.inclHTTPTLS)
case proxy.ProtoQUIC:
qconn = testQUICConnection{
serverName: tc.cliSrvName,
}
// TODO(a.garipov): Find ways of testing this with the new
// quic-go API.
t.Skipf("skipped during the quic-go api update")
case proxy.ProtoTLS:
conn = testTLSConn{
serverName: tc.cliSrvName,
@@ -242,10 +223,9 @@ func TestServer_clientIDFromDNSContext(t *testing.T) {
}
pctx := &proxy.DNSContext{
Proto: tc.proto,
Conn: conn,
HTTPRequest: httpReq,
QUICConnection: qconn,
Proto: tc.proto,
Conn: conn,
HTTPRequest: httpReq,
}
clientID, err := srv.clientIDFromDNSContext(pctx)