refactor(netx): move tlshandshaker logger to netxlite (#402)

Part of https://github.com/ooni/probe/issues/1505

internal/engine/netx/netx.go

@@ -179,7 +179,7 @@ func NewTLSDialer(config Config) TLSDialer {
 	var h tlsHandshaker = &netxlite.TLSHandshakerStdlib{}
 	h = tlsdialer.ErrorWrapperTLSHandshaker{TLSHandshaker: h}
 	if config.Logger != nil {
-		h = tlsdialer.LoggingTLSHandshaker{Logger: config.Logger, TLSHandshaker: h}
+		h = &netxlite.TLSHandshakerLogger{Logger: config.Logger, TLSHandshaker: h}
 	}
 	if config.TLSSaver != nil {
 		h = tlsdialer.SaverTLSHandshaker{TLSHandshaker: h, Saver: config.TLSSaver}

internal/engine/netx/netx_test.go

@@ -292,7 +292,7 @@ func TestNewTLSDialerWithLogging(t *testing.T) {
 	if rtd.TLSHandshaker == nil {
 		t.Fatal("invalid TLSHandshaker")
 	}
-	lth, ok := rtd.TLSHandshaker.(tlsdialer.LoggingTLSHandshaker)
+	lth, ok := rtd.TLSHandshaker.(*netxlite.TLSHandshakerLogger)
 	if !ok {
 		t.Fatal("not the TLSHandshaker we expected")
 	}

internal/engine/netx/tlsdialer/integration_test.go

@@ -17,7 +17,7 @@ func TestTLSDialerSuccess(t *testing.T) {
 	}
 	log.SetLevel(log.DebugLevel)
 	dialer := tlsdialer.TLSDialer{Dialer: new(net.Dialer),
-		TLSHandshaker: tlsdialer.LoggingTLSHandshaker{
+		TLSHandshaker: &netxlite.TLSHandshakerLogger{
 			TLSHandshaker: &netxlite.TLSHandshakerStdlib{},
 			Logger:        log.Log,
 		},

internal/engine/netx/tlsdialer/logging.go

@@ -1,39 +1,7 @@
 package tlsdialer
 
-import (
-	"context"
-	"crypto/tls"
-	"net"
-	"time"
-
-	"github.com/ooni/probe-cli/v3/internal/engine/netx/tlsx"
-)
-
 // Logger is the logger assumed by this package
 type Logger interface {
 	Debugf(format string, v ...interface{})
 	Debug(message string)
 }
-
-// LoggingTLSHandshaker is a TLSHandshaker with logging
-type LoggingTLSHandshaker struct {
-	TLSHandshaker
-	Logger Logger
-}
-
-// Handshake implements Handshaker.Handshake
-func (h LoggingTLSHandshaker) Handshake(
-	ctx context.Context, conn net.Conn, config *tls.Config,
-) (net.Conn, tls.ConnectionState, error) {
-	h.Logger.Debugf("tls {sni=%s next=%+v}...", config.ServerName, config.NextProtos)
-	start := time.Now()
-	tlsconn, state, err := h.TLSHandshaker.Handshake(ctx, conn, config)
-	stop := time.Now()
-	h.Logger.Debugf(
-		"tls {sni=%s next=%+v}... %+v in %s {next=%s cipher=%s v=%s}", config.ServerName,
-		config.NextProtos, err, stop.Sub(start), state.NegotiatedProtocol,
-		tlsx.CipherSuiteString(state.CipherSuite), tlsx.VersionString(state.Version))
-	return tlsconn, state, err
-}
-
-var _ TLSHandshaker = LoggingTLSHandshaker{}

internal/engine/netx/tlsdialer/logging_test.go

@@ -1,28 +0,0 @@
-package tlsdialer_test
-
-import (
-	"context"
-	"crypto/tls"
-	"errors"
-	"io"
-	"testing"
-
-	"github.com/apex/log"
-	"github.com/ooni/probe-cli/v3/internal/engine/netx/tlsdialer"
-)
-
-func TestLoggingTLSHandshakerFailure(t *testing.T) {
-	h := tlsdialer.LoggingTLSHandshaker{
-		TLSHandshaker: tlsdialer.EOFTLSHandshaker{},
-		Logger:        log.Log,
-	}
-	tlsconn, _, err := h.Handshake(context.Background(), tlsdialer.EOFConn{}, &tls.Config{
-		ServerName: "www.google.com",
-	})
-	if !errors.Is(err, io.EOF) {
-		t.Fatal("not the error we expected")
-	}
-	if tlsconn != nil {
-		t.Fatal("expected nil tlsconn here")
-	}
-}