Go to file
Simone Basso b9b555ba68 Integrate further with ooni/probe-engine: episode two (#46)
* 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
2019-08-15 18:08:43 +02:00
cmd/ooni Add rm command to delete results 2018-09-18 09:54:27 +02:00
config Strip the trailing slash from the bouncer url 2018-09-26 15:35:17 +02:00
data Strip the trailing slash from the bouncer url 2018-09-26 15:35:17 +02:00
internal Integrate further with ooni/probe-engine: episode two (#46) 2019-08-15 18:08:43 +02:00
nettests Integrate further with ooni/probe-engine: episode two (#46) 2019-08-15 18:08:43 +02:00
scripts Enable debug mode 2019-05-15 15:34:36 +02:00
utils Use ooni/probe-engine: episode 1 (#42) 2019-05-23 16:38:46 +02:00
version Use ooni/probe-engine: episode 1 (#42) 2019-05-23 16:38:46 +02:00
.dockerignore Ignore dist in .dockerignore 2019-05-15 17:44:00 +02:00
.gitignore Use MK v0.10.x, zap legacy GeoIP, build also on Linux (#29) 2019-05-15 15:48:06 +03:00
.goreleaser.yml Remove getCaBundlePath 2019-05-15 19:25:23 +02:00
.travis.yml Use a different env name for tests 2019-05-15 15:09:42 +02:00
build.sh Use MK v0.10.x, zap legacy GeoIP, build also on Linux (#29) 2019-05-15 15:48:06 +03:00
Dockerfile Integrate further with ooni/probe-engine: episode two (#46) 2019-08-15 18:08:43 +02:00
go.mod Integrate further with ooni/probe-engine: episode two (#46) 2019-08-15 18:08:43 +02:00
go.sum Integrate further with ooni/probe-engine: episode two (#46) 2019-08-15 18:08:43 +02:00
LICENSE.md Add LICENSE.md 2018-07-11 18:06:27 +02:00
Makefile Integrate further with ooni/probe-engine: episode two (#46) 2019-08-15 18:08:43 +02:00
ooni_test.go Basic ooni unittest 2018-09-17 11:52:42 +02:00
ooni.go Integrate further with ooni/probe-engine: episode two (#46) 2019-08-15 18:08:43 +02:00
Readme.md Use MK v0.10.x, zap legacy GeoIP, build also on Linux (#29) 2019-05-15 15:48:06 +03:00

OONI Probe CLI

The next generation OONI Probe Command Line Interface.

Development setup

Be sure you have golang >= 1.12. We use Go modules. Make sure you don't have GOPATH set.

Run

./build.sh help

to get information on the supported systems as well as to get instructions on how to install dependencies.