a3654f60b7
We would like to refactor the code so that a DoH resolver owns the connections of its underlying HTTP client. To do that, we need first to incorporate CloseIdleConnections into the Resolver model. Then, we need to add the same function to all netxlite types that wrap a Resolver type. At the same time, we want the rest of the code for now to continue with the simpler definition of a Resolver, now called ResolverLegacy. We will eventually propagate this change to the rest of the tree and simplify the way in which we manage Resolvers. To make this possible, we introduce a new factory function that adapts a ResolverLegacy to become a Resolver. See https://github.com/ooni/probe/issues/1591.
92 lines
2.5 KiB
Go
92 lines
2.5 KiB
Go
package ndt7
|
|
|
|
import (
|
|
"context"
|
|
"crypto/tls"
|
|
"net/http"
|
|
"net/url"
|
|
|
|
"github.com/gorilla/websocket"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/model"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx/dialer"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx/resolver"
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite"
|
|
)
|
|
|
|
type dialManager struct {
|
|
ndt7URL string
|
|
logger model.Logger
|
|
proxyURL *url.URL
|
|
readBufferSize int
|
|
tlsConfig *tls.Config
|
|
userAgent string
|
|
writeBufferSize int
|
|
}
|
|
|
|
func newDialManager(ndt7URL string, logger model.Logger, userAgent string) dialManager {
|
|
return dialManager{
|
|
ndt7URL: ndt7URL,
|
|
logger: logger,
|
|
readBufferSize: paramMaxBufferSize,
|
|
userAgent: userAgent,
|
|
writeBufferSize: paramMaxBufferSize,
|
|
}
|
|
}
|
|
|
|
func (mgr dialManager) dialWithTestName(ctx context.Context, testName string) (*websocket.Conn, error) {
|
|
var reso resolver.Resolver = &netxlite.ResolverSystem{}
|
|
reso = &netxlite.ResolverLogger{
|
|
Resolver: netxlite.NewResolverLegacyAdapter(reso),
|
|
Logger: mgr.logger,
|
|
}
|
|
dlr := dialer.New(&dialer.Config{
|
|
ContextByteCounting: true,
|
|
Logger: mgr.logger,
|
|
ProxyURL: mgr.proxyURL,
|
|
}, reso)
|
|
dialer := websocket.Dialer{
|
|
NetDialContext: dlr.DialContext,
|
|
ReadBufferSize: mgr.readBufferSize,
|
|
TLSClientConfig: mgr.tlsConfig,
|
|
WriteBufferSize: mgr.writeBufferSize,
|
|
}
|
|
headers := http.Header{}
|
|
headers.Add("Sec-WebSocket-Protocol", "net.measurementlab.ndt.v7")
|
|
headers.Add("User-Agent", mgr.userAgent)
|
|
mgr.logrequest(mgr.ndt7URL, headers)
|
|
conn, _, err := dialer.DialContext(ctx, mgr.ndt7URL, headers)
|
|
mgr.logresponse(err)
|
|
return conn, err
|
|
}
|
|
|
|
func (mgr dialManager) logrequest(url string, headers http.Header) {
|
|
mgr.logger.Debugf("> GET %s", url)
|
|
for key, values := range headers {
|
|
for _, v := range values {
|
|
mgr.logger.Debugf("> %s: %s", key, v)
|
|
}
|
|
}
|
|
mgr.logger.Debug("> Connection: upgrade")
|
|
mgr.logger.Debug("> Upgrade: websocket")
|
|
mgr.logger.Debug(">")
|
|
}
|
|
|
|
func (mgr dialManager) logresponse(err error) {
|
|
if err != nil {
|
|
mgr.logger.Debugf("< %+v", err)
|
|
return
|
|
}
|
|
mgr.logger.Debug("< 101")
|
|
mgr.logger.Debug("< Connection: upgrade")
|
|
mgr.logger.Debug("< Upgrade: websocket")
|
|
mgr.logger.Debug("<")
|
|
}
|
|
|
|
func (mgr dialManager) dialDownload(ctx context.Context) (*websocket.Conn, error) {
|
|
return mgr.dialWithTestName(ctx, "download")
|
|
}
|
|
|
|
func (mgr dialManager) dialUpload(ctx context.Context) (*websocket.Conn, error) {
|
|
return mgr.dialWithTestName(ctx, "upload")
|
|
}
|