83440cf110
The legacy part for now is internal/errorsx. It will stay there until I figure out whether it also needs some extra bug fixing. The good part is now in internal/netxlite/errorsx and contains all the logic for mapping errors. We need to further improve upon this logic by writing more thorough integration tests for QUIC. We also need to copy the various dialer, conn, etc adapters that set errors. We will put them inside netxlite and we will generate errors in a way that is less crazy with respect to the major operation. (The idea is to always wrap, given that now we measure in an incremental way and we don't measure every operation together.) Part of https://github.com/ooni/probe/issues/1591
34 lines
895 B
Go
34 lines
895 B
Go
package errorsx
|
|
|
|
import (
|
|
"context"
|
|
"crypto/tls"
|
|
"net"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite/errorsx"
|
|
)
|
|
|
|
// TLSHandshaker is the generic TLS handshaker
|
|
type TLSHandshaker interface {
|
|
Handshake(ctx context.Context, conn net.Conn, config *tls.Config) (
|
|
net.Conn, tls.ConnectionState, error)
|
|
}
|
|
|
|
// ErrorWrapperTLSHandshaker wraps the returned error to be an OONI error
|
|
type ErrorWrapperTLSHandshaker struct {
|
|
TLSHandshaker
|
|
}
|
|
|
|
// Handshake implements TLSHandshaker.Handshake
|
|
func (h *ErrorWrapperTLSHandshaker) Handshake(
|
|
ctx context.Context, conn net.Conn, config *tls.Config,
|
|
) (net.Conn, tls.ConnectionState, error) {
|
|
tlsconn, state, err := h.TLSHandshaker.Handshake(ctx, conn, config)
|
|
err = SafeErrWrapperBuilder{
|
|
Classifier: errorsx.ClassifyTLSHandshakeError,
|
|
Error: err,
|
|
Operation: errorsx.TLSHandshakeOperation,
|
|
}.MaybeBuild()
|
|
return tlsconn, state, err
|
|
}
|