e4f10eeac2
The objective of this diff is to simplify the code inside engine/netx while moving more bits of code inside netxlite. See https://github.com/ooni/probe/issues/2121
69 lines
2.1 KiB
Go
69 lines
2.1 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.EarlyConnection, 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
|
|
}
|
|
|
|
// connectionState returns the ConnectionState of a QUIC Session.
|
|
func connectionState(sess quic.EarlyConnection) tls.ConnectionState {
|
|
return sess.ConnectionState().TLS.ConnectionState
|
|
}
|