d57c78bc71
This is how I did it: 1. `git clone https://github.com/ooni/probe-engine internal/engine` 2. ``` (cd internal/engine && git describe --tags) v0.23.0 ``` 3. `nvim go.mod` (merging `go.mod` with `internal/engine/go.mod` 4. `rm -rf internal/.git internal/engine/go.{mod,sum}` 5. `git add internal/engine` 6. `find . -type f -name \*.go -exec sed -i 's@/ooni/probe-engine@/ooni/probe-cli/v3/internal/engine@g' {} \;` 7. `go build ./...` (passes) 8. `go test -race ./...` (temporary failure on RiseupVPN) 9. `go mod tidy` 10. this commit message Once this piece of work is done, we can build a new version of `ooniprobe` that is using `internal/engine` directly. We need to do more work to ensure all the other functionality in `probe-engine` (e.g. making mobile packages) are still WAI. Part of https://github.com/ooni/probe/issues/1335
51 lines
1.3 KiB
Go
51 lines
1.3 KiB
Go
package webconnectivity
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"net/url"
|
|
"strings"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter"
|
|
"github.com/ooni/probe-cli/v3/internal/engine/model"
|
|
)
|
|
|
|
// HTTPGetConfig contains the config for HTTPGet
|
|
type HTTPGetConfig struct {
|
|
Addresses []string
|
|
Session model.ExperimentSession
|
|
TargetURL *url.URL
|
|
}
|
|
|
|
// TODO(bassosimone): we should normalize the timings
|
|
|
|
// HTTPGetResult contains the results of HTTPGet
|
|
type HTTPGetResult struct {
|
|
TestKeys urlgetter.TestKeys
|
|
Failure *string
|
|
}
|
|
|
|
// HTTPGet performs the HTTP/HTTPS part of Web Connectivity.
|
|
func HTTPGet(ctx context.Context, config HTTPGetConfig) (out HTTPGetResult) {
|
|
addresses := strings.Join(config.Addresses, " ")
|
|
if addresses == "" {
|
|
// TODO(bassosimone): what to do in this case? We clearly
|
|
// cannot fill the DNS cache...
|
|
return
|
|
}
|
|
target := config.TargetURL.String()
|
|
config.Session.Logger().Infof("GET %s...", target)
|
|
domain := config.TargetURL.Hostname()
|
|
result, err := urlgetter.Getter{
|
|
Config: urlgetter.Config{
|
|
DNSCache: fmt.Sprintf("%s %s", domain, addresses),
|
|
},
|
|
Session: config.Session,
|
|
Target: target,
|
|
}.Get(ctx)
|
|
config.Session.Logger().Infof("GET %s... %+v", target, err)
|
|
out.Failure = result.Failure
|
|
out.TestKeys = result
|
|
return
|
|
}
|