* refactor: start building an Android package Part of https://github.com/ooni/probe/issues/1335. This seems also a good moment to move some packages out of the engine, e.g., oonimkall. This package, for example, is a consumer of the engine, so it makes sense it's not _inside_ it. * fix: committed some stuff I didn't need to commit * fix: oonimkall needs to be public to build The side effect is that we will probably need to bump the major version number every time we change one of these APIs. (We can also of course choose to violate the basic guidelines of Go software, but I believe this is bad form.) I have no problem in bumping the major quite frequently and in any case this monorepo solution is convinving me more than continuing to keep a split between engine and cli. The need to embed assets to make the probe more reliable trumps the negative effects of having to ~frequently bump major because we expose a public API. * fix: let's not forget about libooniffi Honestly, I don't know what to do with this library. I added it to provide a drop in replacement for MK but I have no idea whether it's used and useful. I would not feel comfortable exposing it, unlike oonimkall, since we're not using it. It may be that the right thing to do here is just to delete the package and reduce the amount of code we're maintaining? * woops, we're still missing the publish android script * fix(publish-android.bash): add proper API key * ouch fix another place where the name changed
139 lines
4.0 KiB
Go
139 lines
4.0 KiB
Go
package internal
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"encoding/json"
|
|
"errors"
|
|
"fmt"
|
|
"io/ioutil"
|
|
"net"
|
|
"net/http"
|
|
"net/url"
|
|
|
|
"github.com/apex/log"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/experiment/webconnectivity"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/internal/httpheader"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/runtimex"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/netx"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/version"
|
|
)
|
|
|
|
type (
|
|
// CtrlResponse is the type of response returned by the test helper.
|
|
CtrlResponse = webconnectivity.ControlResponse
|
|
|
|
// ctrlRequest is the type of the request sent to the test helper.
|
|
ctrlRequest = webconnectivity.ControlRequest
|
|
)
|
|
|
|
// The following errors may be returned by this implementation.
|
|
var (
|
|
ErrHTTPStatusCode = errors.New("oohelper: http status code indicates failure")
|
|
ErrUnsupportedURLScheme = errors.New("oohelper: unsupported URL scheme")
|
|
ErrUnsupportedExplicitPort = errors.New("oohelper: unsupported explicit port")
|
|
ErrEmptyURL = errors.New("oohelper: empty server and/or target URL")
|
|
ErrInvalidURL = errors.New("oohelper: cannot parse URL")
|
|
ErrCannotCreateRequest = errors.New("oohelper: cannot create HTTP request")
|
|
ErrCannotParseJSONReply = errors.New("oohelper: cannot parse JSON reply")
|
|
)
|
|
|
|
// OOClient is a client for the OONI Web Connectivity test helper.
|
|
type OOClient struct {
|
|
// HTTPClient is the HTTP client to use.
|
|
HTTPClient *http.Client
|
|
|
|
// Resolver is the resolver to user.
|
|
Resolver netx.Resolver
|
|
}
|
|
|
|
// OOConfig contains configuration for the client.
|
|
type OOConfig struct {
|
|
// ServerURL is the URL of the test helper server.
|
|
ServerURL string
|
|
|
|
// TargetURL is the URL that we want to measure.
|
|
TargetURL string
|
|
}
|
|
|
|
// MakeTCPEndpoints constructs the list of TCP endpoints to send
|
|
// to the Web Connectivity test helper.
|
|
func MakeTCPEndpoints(URL *url.URL, addrs []string) ([]string, error) {
|
|
var (
|
|
port string
|
|
out []string
|
|
)
|
|
if URL.Host != URL.Hostname() {
|
|
return nil, ErrUnsupportedExplicitPort
|
|
}
|
|
switch URL.Scheme {
|
|
case "https":
|
|
port = "443"
|
|
case "http":
|
|
port = "80"
|
|
default:
|
|
return nil, ErrUnsupportedURLScheme
|
|
}
|
|
for _, addr := range addrs {
|
|
out = append(out, net.JoinHostPort(addr, port))
|
|
}
|
|
return out, nil
|
|
}
|
|
|
|
// Do sends a measurement request to the Web Connectivity test
|
|
// helper and receives the corresponding response.
|
|
func (oo OOClient) Do(ctx context.Context, config OOConfig) (*CtrlResponse, error) {
|
|
if config.TargetURL == "" || config.ServerURL == "" {
|
|
return nil, ErrEmptyURL
|
|
}
|
|
targetURL, err := url.Parse(config.TargetURL)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("%w: %s", ErrInvalidURL, err.Error())
|
|
}
|
|
addrs, err := oo.Resolver.LookupHost(ctx, targetURL.Hostname())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
endpoints, err := MakeTCPEndpoints(targetURL, addrs)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
creq := ctrlRequest{
|
|
HTTPRequest: config.TargetURL,
|
|
HTTPRequestHeaders: map[string][]string{
|
|
"Accept": {httpheader.Accept()},
|
|
"Accept-Language": {httpheader.AcceptLanguage()},
|
|
"User-Agent": {httpheader.UserAgent()},
|
|
},
|
|
TCPConnect: endpoints,
|
|
}
|
|
data, err := json.Marshal(creq)
|
|
runtimex.PanicOnError(err, "oohelper: cannot marshal control request")
|
|
log.Debugf("out: %s", string(data))
|
|
req, err := http.NewRequestWithContext(ctx, "POST", config.ServerURL, bytes.NewReader(data))
|
|
if err != nil {
|
|
return nil, fmt.Errorf("%w: %s", ErrCannotCreateRequest, err.Error())
|
|
}
|
|
req.Header.Add("user-agent", fmt.Sprintf(
|
|
"oohelper/%s ooniprobe-engine/%s", version.Version, version.Version,
|
|
))
|
|
req.Header.Add("content-type", "application/json")
|
|
resp, err := oo.HTTPClient.Do(req)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer resp.Body.Close()
|
|
if resp.StatusCode != 200 {
|
|
return nil, ErrHTTPStatusCode
|
|
}
|
|
data, err = ioutil.ReadAll(resp.Body)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
var cresp CtrlResponse
|
|
if err := json.Unmarshal(data, &cresp); err != nil {
|
|
return nil, fmt.Errorf("%w: %s", ErrCannotParseJSONReply, err.Error())
|
|
}
|
|
return &cresp, nil
|
|
}
|