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
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/netx/dialer"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx/resolver"
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
|
"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")
|
|
}
|