566c6b246a
This diff addresses another point of https://github.com/ooni/probe/issues/1956: > - [ ] observe that we're still using a bunch of private interfaces for common interfaces such as the `Dialer`, so we can get rid of these private interfaces and always use the ones in `model`, which allows us to remove a bunch of legacy wrappers Additional cleanups may still be possible. The more I cleanup, the more I see there's extra legacy code we can dispose of (which seems good?).
64 lines
1.9 KiB
Go
64 lines
1.9 KiB
Go
package quicdialer
|
|
|
|
import (
|
|
"context"
|
|
"crypto/tls"
|
|
"time"
|
|
|
|
"github.com/lucas-clemente/quic-go"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx/trace"
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite"
|
|
)
|
|
|
|
// HandshakeSaver saves events occurring during the handshake
|
|
type HandshakeSaver struct {
|
|
Saver *trace.Saver
|
|
model.QUICDialer
|
|
}
|
|
|
|
// DialContext implements ContextDialer.DialContext
|
|
func (h HandshakeSaver) DialContext(ctx context.Context, network string,
|
|
host string, tlsCfg *tls.Config, cfg *quic.Config) (quic.EarlySession, error) {
|
|
start := time.Now()
|
|
// TODO(bassosimone): in the future we probably want to also save
|
|
// information about what versions we're willing to accept.
|
|
h.Saver.Write(trace.Event{
|
|
Address: host,
|
|
Name: "quic_handshake_start",
|
|
NoTLSVerify: tlsCfg.InsecureSkipVerify,
|
|
Proto: network,
|
|
TLSNextProtos: tlsCfg.NextProtos,
|
|
TLSServerName: tlsCfg.ServerName,
|
|
Time: start,
|
|
})
|
|
sess, err := h.QUICDialer.DialContext(ctx, network, host, tlsCfg, cfg)
|
|
stop := time.Now()
|
|
if err != nil {
|
|
h.Saver.Write(trace.Event{
|
|
Duration: stop.Sub(start),
|
|
Err: err,
|
|
Name: "quic_handshake_done",
|
|
NoTLSVerify: tlsCfg.InsecureSkipVerify,
|
|
TLSNextProtos: tlsCfg.NextProtos,
|
|
TLSServerName: tlsCfg.ServerName,
|
|
Time: stop,
|
|
})
|
|
return nil, err
|
|
}
|
|
state := connectionState(sess)
|
|
h.Saver.Write(trace.Event{
|
|
Duration: stop.Sub(start),
|
|
Name: "quic_handshake_done",
|
|
NoTLSVerify: tlsCfg.InsecureSkipVerify,
|
|
TLSCipherSuite: netxlite.TLSCipherSuiteString(state.CipherSuite),
|
|
TLSNegotiatedProto: state.NegotiatedProtocol,
|
|
TLSNextProtos: tlsCfg.NextProtos,
|
|
TLSPeerCerts: trace.PeerCerts(state, err),
|
|
TLSServerName: tlsCfg.ServerName,
|
|
TLSVersion: netxlite.TLSVersionString(state.Version),
|
|
Time: stop,
|
|
})
|
|
return sess, nil
|
|
}
|