ooni / probe-cli / 6222151769

84%

push

github

refactor(model/netx.go): TLSHandhaker now returns a TLSConn (#1281)

I am making progress with https://github.com/ooni/probe/issues/2531 and
I want to reactor model/netx.go such that the TLSHandshaker returns a
model.TLSConn rather than a net.Conn.

Returning a net.Conn and documenting it is a model.TLSConn is bad
compared to returning a model.TLSConn directly.

Note that we cannot apply the same transformation to netxlite's
TLSDialer.DialTLSContext because such a method must be assignable to
net/http and github.com/ooni/oohttp's Transport function also called
DialTLSContext.

The fact that we need code to be assignable to the Transport function is
what historically led the TLSHandshaker to return a net.Conn as well.
But it was quite clear from the get go that this choice led to some
quirks (and, in fact, this behavior was explicitly documented as such).

While there, slightly refactor `internal/experiment/echcheck/utls.go` to
avoid storing the conn inside the handshaker and make sure the test
coverage does not drop for this experiment.

While there, note that https://github.com/ooni/probe/issues/2538 exists
and commit a mitigation.

44 of 54 new or added lines in 13 files covered. (81.48%)

23069 of 28392 relevant lines covered (81.25%)

28.17 hits per line