Commit Graph

66 Commits

Author SHA1 Message Date
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
Simone Basso
df629237be
Use ooni/probe-engine: episode 1 (#42) 2019-05-23 16:38:46 +02:00
Simone Basso
9992690f8f Use MK v0.10.x, zap legacy GeoIP, build also on Linux (#29)
* Gopkg.lock: use MK v0.10.3

* ooni: stop using legacy GeoIP database files

* Some yak shaving of Makefile

1. remove now broken commands to download deps

2. also define the CXX cross compiler

* chore(dep): migrate from dep to go 1.11+ modules

See https://blog.callr.tech/migrating-from-dep-to-go-1.11-modules/

I need this to simplify my life in building for Travis.

* Introduce build.sh and repair build

In going forward, I believe we don't actually need a Makefile but I
didn't want to make such a radical change now.

* Another strategy wrt gopath

* travis: run regress tests on macOS

Closes #30
2019-05-15 15:48:06 +03:00
Arturo Filastò
34556dcbf1 Add support for running all tests with ooni run 2018-09-27 18:38:37 +02:00
Arturo Filastò
2b01dfaa17 Close the DB before deleting ooni_home 2018-09-26 15:09:59 +02:00
Arturo Filastò
a60f376846 Adjust the progress bars depending on the test type 2018-09-24 15:57:28 +02:00
Arturo Filastò
0d21186492 Add support for custom collectors and bouncers 2018-09-21 18:54:44 +02:00
Arturo Filastò
47a2fbb88c Add rm command to delete results 2018-09-18 09:54:27 +02:00
Arturo Filastò
18a89f4cbd [schema-change] Prefix all columns that could cause conflicts 2018-09-17 17:30:38 +02:00
Arturo Filastò
30c6041423 Remove unused nettest command 2018-09-17 16:33:56 +02:00
Arturo Filastò
d55cccc236 Exit with non-zero code when trying to do interactive onboarding and --batch is set 2018-09-17 16:16:56 +02:00
Arturo Filastò
5cae6b0b83 Make it possible to disable uploading of results 2018-09-17 11:51:54 +02:00
Arturo Filastò
4ed94dfc53 Improve the presentation of the measurement listing from the CLI 2018-09-13 14:54:56 +02:00
Arturo Filastò
b1ae8bc13e Show data usage in summary of measurements 2018-09-12 15:41:54 +02:00
Arturo Filastò
54af7170d4 Add support for data_usage event 2018-09-12 13:42:16 +02:00
Arturo Filastò
0ee0c28129 Resolve country code ambigious selection 2018-09-11 18:06:15 +02:00
Arturo Filastò
d02ed117f9 Include total_runtime in the summary of measurements 2018-09-11 16:36:09 +02:00
Arturo Filastò
8da12a9c07 Add measurement summary to list command 2018-09-11 15:40:42 +02:00
Arturo Filastò
1637fdbf93 Structured output of measurements 2018-09-10 18:03:32 +02:00
Arturo Filastò
e5c508a94c Fix bug in result listing 2018-09-10 16:56:32 +02:00
Arturo Filastò
e0c0acffeb Make error reporting more robust to panic 2018-09-10 16:29:14 +02:00
Arturo Filastò
5055eaa88a Add info and reset commands 2018-09-10 15:15:29 +02:00
Arturo Filastò
898332064b Add result testkeys projection 2018-09-10 15:03:52 +02:00
Arturo Filastò
b29071f37b Replace summary with test_keys 2018-09-10 12:41:28 +02:00
Arturo Filastò
b727aba854 Update result listing 2018-09-07 15:39:22 +02:00
Arturo Filastò
35bd334cfc Update the measurement, network and url creation to the new schema 2018-09-07 12:55:27 +02:00
Arturo Filastò
b75cee5e84 Progress on schema and fixing unittests 2018-09-06 16:13:04 +02:00
Arturo Filastò
ff2f973523 Start integrating upper/db as a new ORM 2018-09-05 18:40:37 +02:00
Arturo Filastò
247d128b19 Add _is_beta flag to config file 2018-07-30 18:51:44 +02:00
Arturo Filastò
45aea93e6b Fix default config and version 2018-07-14 16:58:08 +02:00
Arturo Filastò
83ed5fa767 Fix bug in version info 2018-07-11 18:06:13 +02:00
Arturo Filastò
d8cbfd1b90 One color package to rule them all. 2018-06-29 16:50:05 +02:00
Arturo Filastò
a6b95f50c9 Move onboard into a separate package 2018-06-25 17:14:29 +02:00
Arturo Filastò
aae2805786 Write the config file when onboarding is run 2018-06-25 17:09:10 +02:00
Arturo Filastò
7951ee6bb5 Add onboard command 2018-06-25 16:31:44 +02:00
Arturo Filastò
38a5637cf5 Write to output when a function is not implemented 2018-06-25 13:19:54 +02:00
Arturo Filastò
030ecacf80 Improve the help output of run 2018-06-22 14:55:00 +02:00
Arturo Filastò
65b5feef0d Make the geoip lookup output prettier 2018-06-22 14:25:30 +02:00
Arturo Filastò
eb4e6988b3 Implement quick and dirty measurement listing 2018-06-22 12:12:35 +02:00
Arturo Filastò
703b260903 Implement missing bits in result listing 2018-06-22 11:53:10 +02:00
Arturo Filastò
15c901ed68 Make the download of geoip data files conditional 2018-06-22 11:17:51 +02:00
Arturo Filastò
1bba0c7899 Add basic unittests for the config related functionality 2018-06-22 11:01:15 +02:00
Arturo Filastò
a0be45e323 Fix paths to be windows friendly 2018-05-31 12:33:08 +02:00
Arturo Filastò
c620bc9726 Make path and homedir related logic more robust
Add ability to pass OONI_HOME environment variable
2018-05-21 17:33:59 -07:00
Arturo Filastò
ecf3370f53 Implement result listing from CLI
Change the schema to include ASN and Network Name in the results table
2018-05-03 18:40:52 +02:00
Arturo Filastò
0c5b6aa37c Rename gooni to probe-cli
This is the command I used:
```
rg 'github.com/openobservatory/gooni' --files-with-matches \
    | xargs sed -i '' 's/github.com\/openobservatory\/gooni/github.com\/ooni\/probe-cli/g'
```
2018-05-03 14:59:55 +02:00
Arturo Filastò
749cc665af Add support for downloading legacy geoip databases
Pass the geoip databases to measurement-kit
2018-03-23 15:26:25 +01:00
Arturo Filastò
00859e87a6 Get web_connectivity to work with dynamic URL fetching 2018-03-23 12:41:06 +01:00
Arturo Filastò
7fe1551951 Refactor how we create the context 2018-03-23 12:10:14 +01:00
Arturo Filastò
e852713ed7 Add functions for structured progress logging 2018-03-22 15:22:29 +01:00