c6b3889a33
1. Use the netxlite.NewHTTPTransport factory for creating a new
HTTP2 (and HTTP1) transport;
2. Recognize the netxlite.NewOOHTTPTransport has now become
an implementation detail so make it private;
3. Recognize that netxlite.NewHTTP3Transport should call
netxlite.WrapTransport so it returns the same typechain
returned by netxlite.NewHTTPTransport (modulo, of course,
the real underlying transport), so ensure that we are
calling netxlite.WrapTransport in NewHTTP3Transport;
4. Recognize that the table based constructor inside of
netx needs a logger to create HTTPTransport instances using
either netxlite.NewHTTP{,3}Transport so pass this argument
along and ensure it's not nil using a constructor inside
model that guarantees that;
5. Cleanup netx's tests to avoid type asserting on the
typechains returned by netxlite since we already test
that inside netxlite;
6. Recognize that now we can make more legacy names inside
of netxlite private because we don't need to use them
inside tests anymore (because of previous point).
Reference issue: https://github.com/ooni/probe/issues/2121
64 lines
1.7 KiB
Go
64 lines
1.7 KiB
Go
package netxlite
|
|
|
|
//
|
|
// HTTP3 code
|
|
//
|
|
|
|
import (
|
|
"crypto/tls"
|
|
"io"
|
|
"net/http"
|
|
|
|
"github.com/lucas-clemente/quic-go/http3"
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
|
)
|
|
|
|
// http3RoundTripper is the abstract type of quic-go/http3.RoundTripper.
|
|
type http3RoundTripper interface {
|
|
http.RoundTripper
|
|
io.Closer
|
|
}
|
|
|
|
// http3Transport is an HTTPTransport using the http3 protocol.
|
|
type http3Transport struct {
|
|
child http3RoundTripper
|
|
dialer model.QUICDialer
|
|
}
|
|
|
|
var _ model.HTTPTransport = &http3Transport{}
|
|
|
|
// Network implements HTTPTransport.Network.
|
|
func (txp *http3Transport) Network() string {
|
|
return "quic"
|
|
}
|
|
|
|
// RoundTrip implements HTTPTransport.RoundTrip.
|
|
func (txp *http3Transport) RoundTrip(req *http.Request) (*http.Response, error) {
|
|
return txp.child.RoundTrip(req)
|
|
}
|
|
|
|
// CloseIdleConnections implements HTTPTransport.CloseIdleConnections.
|
|
func (txp *http3Transport) CloseIdleConnections() {
|
|
txp.child.Close()
|
|
txp.dialer.CloseIdleConnections()
|
|
}
|
|
|
|
// NewHTTP3Transport creates a new HTTPTransport using http3. The
|
|
// dialer argument MUST NOT be nil. If the tlsConfig argument is nil,
|
|
// then the code will use the default TLS configuration.
|
|
func NewHTTP3Transport(
|
|
logger model.DebugLogger, dialer model.QUICDialer, tlsConfig *tls.Config) model.HTTPTransport {
|
|
return WrapHTTPTransport(logger, &http3Transport{
|
|
child: &http3.RoundTripper{
|
|
Dial: dialer.DialContext,
|
|
// The following (1) reduces the number of headers that Go will
|
|
// automatically send for us and (2) ensures that we always receive
|
|
// back the true headers, such as Content-Length. This change is
|
|
// functional to OONI's goal of observing the network.
|
|
DisableCompression: true,
|
|
TLSClientConfig: tlsConfig,
|
|
},
|
|
dialer: dialer,
|
|
})
|
|
}
|