d57c78bc71
This is how I did it: 1. `git clone https://github.com/ooni/probe-engine internal/engine` 2. ``` (cd internal/engine && git describe --tags) v0.23.0 ``` 3. `nvim go.mod` (merging `go.mod` with `internal/engine/go.mod` 4. `rm -rf internal/.git internal/engine/go.{mod,sum}` 5. `git add internal/engine` 6. `find . -type f -name \*.go -exec sed -i 's@/ooni/probe-engine@/ooni/probe-cli/v3/internal/engine@g' {} \;` 7. `go build ./...` (passes) 8. `go test -race ./...` (temporary failure on RiseupVPN) 9. `go mod tidy` 10. this commit message Once this piece of work is done, we can build a new version of `ooniprobe` that is using `internal/engine` directly. We need to do more work to ensure all the other functionality in `probe-engine` (e.g. making mobile packages) are still WAI. Part of https://github.com/ooni/probe/issues/1335
63 lines
1.9 KiB
Go
63 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/internal/tlsx"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx/trace"
|
|
)
|
|
|
|
// HandshakeSaver saves events occurring during the handshake
|
|
type HandshakeSaver struct {
|
|
Saver *trace.Saver
|
|
Dialer ContextDialer
|
|
}
|
|
|
|
// 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.Dialer.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: tlsx.CipherSuiteString(state.CipherSuite),
|
|
TLSNegotiatedProto: state.NegotiatedProtocol,
|
|
TLSNextProtos: tlsCfg.NextProtos,
|
|
TLSPeerCerts: trace.PeerCerts(state, err),
|
|
TLSServerName: tlsCfg.ServerName,
|
|
TLSVersion: tlsx.VersionString(state.Version),
|
|
Time: stop,
|
|
})
|
|
return sess, nil
|
|
}
|