From 52713a2600d94a2dde0d64043385cf628a30e78c Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Wed, 1 Nov 2023 13:57:59 +0300 Subject: [PATCH] Pull request 2057: dnsforward: imp clientid log Updates #6371. Squashed commit of the following: commit 0461266a5420c985af6bb0b36a42af54bc62e075 Author: Ainar Garipov Date: Tue Oct 31 21:38:20 2023 +0300 dnsforward: imp clientid log --- internal/dnsforward/clientid.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/internal/dnsforward/clientid.go b/internal/dnsforward/clientid.go index a7f2902a..0e39744c 100644 --- a/internal/dnsforward/clientid.go +++ b/internal/dnsforward/clientid.go @@ -8,6 +8,7 @@ import ( "github.com/AdguardTeam/dnsproxy/proxy" "github.com/AdguardTeam/golibs/errors" + "github.com/AdguardTeam/golibs/log" "github.com/AdguardTeam/golibs/netutil" "github.com/quic-go/quic-go" ) @@ -151,6 +152,8 @@ func (s *Server) clientIDFromDNSContext(pctx *proxy.DNSContext) (clientID string // DNS-over-HTTPS requests, it will return the hostname part of the Host header // if there is one. func clientServerName(pctx *proxy.DNSContext, proto proxy.Proto) (srvName string, err error) { + from := "tls conn" + switch proto { case proxy.ProtoHTTPS: r := pctx.HTTPRequest @@ -164,6 +167,7 @@ func clientServerName(pctx *proxy.DNSContext, proto proxy.Proto) (srvName string } srvName = host + from = "host header" } case proxy.ProtoQUIC: qConn := pctx.QUICConnection @@ -183,5 +187,7 @@ func clientServerName(pctx *proxy.DNSContext, proto proxy.Proto) (srvName string srvName = tc.ConnectionState().ServerName } + log.Debug("dnsforward: got client server name %q from %s", srvName, from) + return srvName, nil }