273b70bacc
## Checklist - [x] I have read the [contribution guidelines](https://github.com/ooni/probe-cli/blob/master/CONTRIBUTING.md) - [x] reference issue for this pull request: https://github.com/ooni/probe/issues/1885 - [x] related ooni/spec pull request: N/A Location of the issue tracker: https://github.com/ooni/probe ## Description This PR contains a set of changes to move important interfaces and data types into the `./internal/model` package. The criteria for including an interface or data type in here is roughly that the type should be important and used by several packages. We are especially interested to move more interfaces here to increase modularity. An additional side effect is that, by reading this package, one should be able to understand more quickly how different parts of the codebase interact with each other. This is what I want to move in `internal/model`: - [x] most important interfaces from `internal/netxlite` - [x] everything that was previously part of `internal/engine/model` - [x] mocks from `internal/netxlite/mocks` should also be moved in here as a subpackage
74 lines
2.2 KiB
Go
74 lines
2.2 KiB
Go
package netxlite
|
|
|
|
import (
|
|
"context"
|
|
"crypto/tls"
|
|
"io"
|
|
"net/http"
|
|
|
|
"github.com/lucas-clemente/quic-go"
|
|
"github.com/lucas-clemente/quic-go/http3"
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
|
)
|
|
|
|
// http3Dialer adapts a QUICContextDialer to work with
|
|
// an http3.RoundTripper. This is necessary because the
|
|
// http3.RoundTripper does not support DialContext.
|
|
type http3Dialer struct {
|
|
model.QUICDialer
|
|
}
|
|
|
|
// dial is like QUICContextDialer.DialContext but without context.
|
|
func (d *http3Dialer) dial(network, address string, tlsConfig *tls.Config,
|
|
quicConfig *quic.Config) (quic.EarlySession, error) {
|
|
return d.QUICDialer.DialContext(
|
|
context.Background(), network, address, tlsConfig, quicConfig)
|
|
}
|
|
|
|
// 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{}
|
|
|
|
// 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 &httpTransportLogger{
|
|
HTTPTransport: &http3Transport{
|
|
child: &http3.RoundTripper{
|
|
Dial: (&http3Dialer{dialer}).dial,
|
|
// 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,
|
|
},
|
|
Logger: logger,
|
|
}
|
|
}
|