b9b555ba68
* utils/geoip.go: use github.com/ooni/probe-engine Let's start using the engine by rewriting utils/geoip.go to be just a thin wrapper around the engine functionality. * Ready for review * Checkpoint: the im tests are converted Still have some doubts with respect to the variables that are passed to MK via probe-engine. Will double check. * fix(i/c/r/run.go): write the correct logic * nettests: one more comment and also fix a format string * Tweak previous * progress * Fix doofus * better comment * XXX => actionable comment * Add glue to simplify test keys management Making the concept of measurement more abstract in the engine is not feasible because, when submitting a measurement, we need to modify it to update the report ID and the measurement ID. Therefore, returning a serialized measurement is not a good idea. We will keep using a model.Measurement in the engine. Changing model.Measurement.TestKeys's type from a `interface{}` pointing to a well defined data structure to `map[string]interface{}` is a regression because means that we are moving from code that has a clear and defined structure to code that is more complicated to parse and validate. Since we're already suffering havily from the lack of a good schema, I'm not going to make the situation worst by worsening the engine. At least for ndt7 and psiphon, we now have a good schema and I don't want to lose that. However, the current code in this repository is expecting the test keys to be a `map[string]interface{}`. This choice was dictated by the fact that we receive a JSON from Measurement Kit and by the fact that there's not a clear schema. To solve this tension, in this commit I am going to write glue adapter code that makes sure that the TestKeys of a Measurement are converted to `map[string]interface{}`. This will be done using a type cast where possible and JSON serialization and parsing otherwise. In a perfect world, glue is not a good idea, but in a real world it may actually be useful. When all tests in the engine will have a clear Go data structure, we'll then remove the glue and just cast to the proper data structure from `interface{}` where required. * nettests/performance: use probe-engine * go.{mod,sum}: upgrade to latest probe-engine * nettests/middlebox: use ooni/probe-engine * Update to the latest probe-engine * web_connectivity: rewrite to use probe-engine * Cosmetic change suggested by @hellais * nettests/nettests.go: remove unused code * nettests/nettests.go: fix progress * nettests/nettests.go: remove go-measurement-kit code * We don't depend on go-measurement-kit anymore * Improve non-verbose output where possible See also: https://github.com/measurement-kit/measurement-kit/issues/1856 * Make web_connectivity output pleasant * Update to the latest probe-engine * nettests/nettests.go: honour sharing settings * Update to the latest probe-engine * Use log.WithFields for probe-engine * Update go.mod go.sum * Revert "Update go.mod go.sum" This reverts commit 5ecd38d8236f4a4e9b77ddb8e8a0d1e3cdd4b818. * Revert "Revert "Update go.mod go.sum"" This reverts commit 6114b31eca98826112032776bd0feff02d763ecd. * Upgrade ooni/probe-engine * Unset GOPATH before running go build commands * Dockefile: fix linux build by using latest * Update to the latest ooni/probe-engine ``` go get -u github.com/ooni/probe-engine go mod tidy ``` * Repair build
102 lines
2.4 KiB
Go
102 lines
2.4 KiB
Go
package websites
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/apex/log"
|
|
"github.com/ooni/probe-cli/internal/database"
|
|
"github.com/ooni/probe-cli/nettests"
|
|
"github.com/ooni/probe-engine/experiment/web_connectivity"
|
|
"github.com/ooni/probe-engine/orchestra/testlists"
|
|
)
|
|
|
|
func lookupURLs(ctl *nettests.Controller) ([]string, map[int64]int64, error) {
|
|
var urls []string
|
|
urlIDMap := make(map[int64]int64)
|
|
testlist, err := testlists.NewClient(ctl.Ctx.Session).Do(
|
|
context.Background(), ctl.Ctx.Session.ProbeCC(),
|
|
)
|
|
if err != nil {
|
|
return nil, nil, err
|
|
}
|
|
for idx, url := range testlist {
|
|
log.Debugf("Going over URL %d", idx)
|
|
urlID, err := database.CreateOrUpdateURL(
|
|
ctl.Ctx.DB, url.URL, url.CategoryCode, url.CountryCode,
|
|
)
|
|
if err != nil {
|
|
log.Error("failed to add to the URL table")
|
|
return nil, nil, err
|
|
}
|
|
log.Debugf("Mapped URL %s to idx %d and urlID %d", url.URL, idx, urlID)
|
|
urlIDMap[int64(idx)] = urlID
|
|
urls = append(urls, url.URL)
|
|
}
|
|
return urls, urlIDMap, nil
|
|
}
|
|
|
|
// WebConnectivity test implementation
|
|
type WebConnectivity struct {
|
|
}
|
|
|
|
// Run starts the test
|
|
func (n WebConnectivity) Run(ctl *nettests.Controller) error {
|
|
urls, urlIDMap, err := lookupURLs(ctl)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
ctl.SetInputIdxMap(urlIDMap)
|
|
experiment := web_connectivity.NewExperiment(
|
|
ctl.Ctx.Session,
|
|
web_connectivity.Config{LogLevel: "INFO"},
|
|
)
|
|
return ctl.Run(experiment, urls)
|
|
}
|
|
|
|
// WebConnectivityTestKeys for the test
|
|
type WebConnectivityTestKeys struct {
|
|
Accessible bool `json:"accessible"`
|
|
Blocking string `json:"blocking"`
|
|
IsAnomaly bool `json:"-"`
|
|
}
|
|
|
|
// GetTestKeys generates a summary for a test run
|
|
func (n WebConnectivity) GetTestKeys(tk map[string]interface{}) (interface{}, error) {
|
|
var (
|
|
blocked bool
|
|
blocking string
|
|
accessible bool
|
|
)
|
|
|
|
// We need to do these complicated type assertions, because some of the fields
|
|
// are "nullable" and/or can be of different types
|
|
switch v := tk["blocking"].(type) {
|
|
case bool:
|
|
blocked = false
|
|
blocking = "none"
|
|
case string:
|
|
blocked = true
|
|
blocking = v
|
|
default:
|
|
blocked = false
|
|
blocking = "none"
|
|
}
|
|
|
|
if tk["accessible"] == nil {
|
|
accessible = false
|
|
} else {
|
|
accessible = tk["accessible"].(bool)
|
|
}
|
|
|
|
return WebConnectivityTestKeys{
|
|
Accessible: accessible,
|
|
Blocking: blocking,
|
|
IsAnomaly: blocked,
|
|
}, nil
|
|
}
|
|
|
|
// LogSummary writes the summary to the standard output
|
|
func (n WebConnectivity) LogSummary(s string) error {
|
|
return nil
|
|
}
|