1874f7a7c2
This diff enables `websteps` to use uTLS for TLS parroting. It integrates the `oohttp.StdlibTransport` wrapper which uses the `ooni/oohttp` fork. `oohttp` supports TLS-like connections like `utls.Conn`. As a prototype, the testhelper and `websteps` code now uses the `utls.HelloChrome_Auto` fingerprint, i.e. the simulated TLS fingerprint of the Google Chrome browser. It is a further contribution for my GSoC project. Reference issue: https://github.com/ooni/probe/issues/1733
128 lines
3.8 KiB
Go
128 lines
3.8 KiB
Go
package websteps
|
|
|
|
import (
|
|
"context"
|
|
"crypto/tls"
|
|
"errors"
|
|
"net"
|
|
"net/http"
|
|
"net/url"
|
|
"sync"
|
|
|
|
"github.com/lucas-clemente/quic-go"
|
|
"github.com/lucas-clemente/quic-go/http3"
|
|
oohttp "github.com/ooni/oohttp"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx/quicdialer"
|
|
"github.com/ooni/probe-cli/v3/internal/errorsx"
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite"
|
|
"github.com/ooni/probe-cli/v3/internal/runtimex"
|
|
)
|
|
|
|
var ErrNoConnReuse = errors.New("cannot reuse connection")
|
|
|
|
func NewRequest(ctx context.Context, URL *url.URL, headers http.Header) *http.Request {
|
|
req, err := http.NewRequestWithContext(ctx, "GET", URL.String(), nil)
|
|
runtimex.PanicOnError(err, "NewRequestWithContect failed")
|
|
for k, vs := range headers {
|
|
for _, v := range vs {
|
|
req.Header.Add(k, v)
|
|
}
|
|
}
|
|
return req
|
|
}
|
|
|
|
// NewDialerResolver contructs a new dialer for TCP connections,
|
|
// with default, errorwrapping and resolve functionalities
|
|
func NewDialerResolver(resolver netxlite.Resolver) netxlite.Dialer {
|
|
var d netxlite.Dialer = netxlite.DefaultDialer
|
|
d = &errorsx.ErrorWrapperDialer{Dialer: d}
|
|
d = &netxlite.DialerResolver{Resolver: resolver, Dialer: d}
|
|
return d
|
|
}
|
|
|
|
// NewQUICDialerResolver creates a new QUICDialerResolver
|
|
// with default, errorwrapping and resolve functionalities
|
|
func NewQUICDialerResolver(resolver netxlite.Resolver) netxlite.QUICContextDialer {
|
|
var ql quicdialer.QUICListener = &netxlite.QUICListenerStdlib{}
|
|
ql = &errorsx.ErrorWrapperQUICListener{QUICListener: ql}
|
|
var dialer netxlite.QUICContextDialer = &netxlite.QUICDialerQUICGo{
|
|
QUICListener: ql,
|
|
}
|
|
dialer = &errorsx.ErrorWrapperQUICDialer{Dialer: dialer}
|
|
dialer = &netxlite.QUICDialerResolver{Resolver: resolver, Dialer: dialer}
|
|
return dialer
|
|
}
|
|
|
|
// NewSingleH3Transport creates an http3.RoundTripper.
|
|
func NewSingleH3Transport(qsess quic.EarlySession, tlscfg *tls.Config, qcfg *quic.Config) http.RoundTripper {
|
|
transport := &http3.RoundTripper{
|
|
DisableCompression: true,
|
|
TLSClientConfig: tlscfg,
|
|
QuicConfig: qcfg,
|
|
Dial: (&SingleDialerH3{qsess: &qsess}).Dial,
|
|
}
|
|
return transport
|
|
}
|
|
|
|
// NewSingleTransport creates a new HTTP transport with a single-use dialer.
|
|
func NewSingleTransport(conn net.Conn) http.RoundTripper {
|
|
singledialer := &SingleDialer{conn: &conn}
|
|
transport := newBaseTransport()
|
|
transport.DialContext = singledialer.DialContext
|
|
transport.DialTLSContext = singledialer.DialContext
|
|
return transport
|
|
}
|
|
|
|
// NewSingleTransport creates a new HTTP transport with a custom dialer and handshaker.
|
|
func NewTransportWithDialer(dialer netxlite.Dialer, tlsConfig *tls.Config, handshaker netxlite.TLSHandshaker) http.RoundTripper {
|
|
transport := newBaseTransport()
|
|
transport.DialContext = dialer.DialContext
|
|
transport.DialTLSContext = (&netxlite.TLSDialer{
|
|
Config: tlsConfig,
|
|
Dialer: dialer,
|
|
TLSHandshaker: handshaker,
|
|
}).DialTLSContext
|
|
return transport
|
|
}
|
|
|
|
// newBaseTransport creates a new HTTP transport with the default dialer.
|
|
func newBaseTransport() (transport *oohttp.StdlibTransport) {
|
|
base := oohttp.DefaultTransport.(*oohttp.Transport).Clone()
|
|
base.DisableCompression = true
|
|
base.MaxConnsPerHost = 1
|
|
transport = &oohttp.StdlibTransport{Transport: base}
|
|
return transport
|
|
}
|
|
|
|
type SingleDialer struct {
|
|
sync.Mutex
|
|
conn *net.Conn
|
|
}
|
|
|
|
func (s *SingleDialer) DialContext(ctx context.Context, network string, addr string) (net.Conn, error) {
|
|
s.Lock()
|
|
defer s.Unlock()
|
|
if s.conn == nil {
|
|
return nil, ErrNoConnReuse
|
|
}
|
|
c := s.conn
|
|
s.conn = nil
|
|
return *c, nil
|
|
}
|
|
|
|
type SingleDialerH3 struct {
|
|
sync.Mutex
|
|
qsess *quic.EarlySession
|
|
}
|
|
|
|
func (s *SingleDialerH3) Dial(network, addr string, tlsCfg *tls.Config, cfg *quic.Config) (quic.EarlySession, error) {
|
|
s.Lock()
|
|
defer s.Unlock()
|
|
if s.qsess == nil {
|
|
return nil, ErrNoConnReuse
|
|
}
|
|
qs := s.qsess
|
|
s.qsess = nil
|
|
return *qs, nil
|
|
}
|