c/ooni-probe-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
f8a49c972d
ooni-probe-cli/go.sum

640 lines
63 KiB
Plaintext
Raw Normal View History

Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
git.schwanenlied.me/yawning/bsaes.git v0.0.0-20190320102049-26d1add596b6 h1:zOrl5/RvK48MxMrif6Z+/OpuYyRnvB+ZTrQWEV9VYb0=
git.schwanenlied.me/yawning/bsaes.git v0.0.0-20190320102049-26d1add596b6/go.mod h1:BWqTsj8PgcPriQJGl7el20J/7TuT1d/hSyFDXMEpoEo=
git.torproject.org/pluggable-transports/goptlib.git v1.0.0/go.mod h1:YT4XMSkuEXbtqlydr9+OxqFAyspUv0Gr9qhM3B++o/Q=
git.torproject.org/pluggable-transports/goptlib.git v1.1.0 h1:LMQAA8pAho+QtYrrVNimJQiINNEwcwuuD99vezD/PAo=
git.torproject.org/pluggable-transports/goptlib.git v1.1.0/go.mod h1:YT4XMSkuEXbtqlydr9+OxqFAyspUv0Gr9qhM3B++o/Q=
github.com/AndreasBriese/bbloom v0.0.0-20170702084017-28f7e881ca57 h1:CVuXDbdzPW0XCNYTldy5dQues57geAs+vfwz3FTTpy8=
github.com/AndreasBriese/bbloom v0.0.0-20170702084017-28f7e881ca57/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
Upgrade to ooni/probe-engine@v0.1.1 (#60)
2019-10-03 09:43:25 +02:00
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/DataDog/zstd v1.3.6-0.20190409195224-796139022798/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo=
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 14:48:06 +02:00
github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8 h1:xzYJEypr/85nBpB11F9br+3HUrpgb+fcm5iADzXXYEw=
github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod h1:oX5x61PbNXchhh0oikYAH+4Pcfw5LKv21+Jnpr6r6Pc=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/Psiphon-Inc/rotate-safe-writer v0.0.0-20170228160301-b276127301a9 h1:6IRS6D+hXUqTS/aPqYMRwj2pan6gGnEi1KuYREk5sMQ=
Use ooni/probe-engine: episode 1 (#42)
2019-05-23 16:38:46 +02:00
github.com/Psiphon-Inc/rotate-safe-writer v0.0.0-20170228160301-b276127301a9/go.mod h1:ZdY5pBfat/WVzw3eXbIf7N1nZN0XD5H5+X8ZMDWbCs4=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/Psiphon-Labs/bolt v0.0.0-20190731171712-94750aa2185e h1:2zxppKeojJOuiO2aRjvVTD13hTPb+0RCia+TbGZX4Dg=
github.com/Psiphon-Labs/bolt v0.0.0-20190731171712-94750aa2185e/go.mod h1:nYj8s6HxsjYV7vZjTiH3tMcVjj/x+R702DXT89PomgE=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/Psiphon-Labs/dns v0.0.0-20170814182607-d23cdaf67bbc h1:W+dNJivdYUujm+mhvmSDn3847jbzar8J7qzjj/w4U6I=
Use ooni/probe-engine: episode 1 (#42)
2019-05-23 16:38:46 +02:00
github.com/Psiphon-Labs/dns v0.0.0-20170814182607-d23cdaf67bbc/go.mod h1:F1eU0RdWZXN2kn6A8cBRixr1HLyM1Va7xXp88LRhlps=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/Psiphon-Labs/goarista v0.0.0-20160825065156-d002785f4c67 h1:aQE2/masBGr/uqI63UIxN/IkRByNTxjYz2JYySw9ry8=
Use ooni/probe-engine: episode 1 (#42)
2019-05-23 16:38:46 +02:00
github.com/Psiphon-Labs/goarista v0.0.0-20160825065156-d002785f4c67/go.mod h1:5Jm7sRmp4HSWIoZk/ZRryF/KbcQeIhBMoaGqD7psbkU=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/Psiphon-Labs/goptlib v0.0.0-20180426172440-18963be5f9c5 h1:j/XkyeIrn14WWZjPDDR3Mi3FyyMLGcXkJRZ5w3O8jWk=
Use ooni/probe-engine: episode 1 (#42)
2019-05-23 16:38:46 +02:00
github.com/Psiphon-Labs/goptlib v0.0.0-20180426172440-18963be5f9c5/go.mod h1:Pe5BqN2DdIdChorAXl6bDaQd/wghpCleJfid2NoSli0=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/Psiphon-Labs/net v0.0.0-20191204183604-f5d60dada742 h1:te4lDZfA3tFwaheo+h/GZYGiLGJvm7Dcq2YkFh13QmE=
github.com/Psiphon-Labs/net v0.0.0-20191204183604-f5d60dada742/go.mod h1:3mBCrUrPxFCKAhG0ZdEfiU7QU6zl2+gr1HUk1sKYdjI=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/Psiphon-Labs/psiphon-tunnel-core v2.0.10-0.20200122032119-5e7e7f3eddd2+incompatible h1:aOG3DD26FWCtmrqHcCp3vwzZf93gsNk/WOuzH2tCiGI=
github.com/Psiphon-Labs/psiphon-tunnel-core v2.0.10-0.20200122032119-5e7e7f3eddd2+incompatible/go.mod h1:VcNEtiQ0z2sCGJf16ZGcpwCas5+r9rt+P20r6LlJ06U=
github.com/Psiphon-Labs/quic-go v0.14.1-0.20200116022806-abf539ac596a h1:MfvK88D9Digt/FMxOXs1qeFXsmp8aIOCsKh6UpMcKHY=
github.com/Psiphon-Labs/quic-go v0.14.1-0.20200116022806-abf539ac596a/go.mod h1:I0Z7XA8KzHZl2MzwqEbZJhBQOHT8ajGUQ5+SWf5KHw0=
github.com/Psiphon-Labs/tls-tris v0.0.0-20191206190901-78f52e6d6243 h1:UfS5bLTwiVnbRub2H6lAcS+T2e62RWWc/LgZs8lXkn4=
github.com/Psiphon-Labs/tls-tris v0.0.0-20191206190901-78f52e6d6243/go.mod h1:v3y9GXFo9Sf2mO6auD2ExGG7oDgrK8TI7eb49ZnUxrE=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/Shopify/sarama v1.23.1/go.mod h1:XLH1GYJnLVE0XCr6KdJGVJRTwY30moWNJ4sERjXX6fs=
github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 h1:w1UutsfOrms1J05zt7ISrnJIXKzwaspym5BTKGx93EI=
Use ooni/probe-engine: episode 1 (#42)
2019-05-23 16:38:46 +02:00
github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412/go.mod h1:WPjqKcmVOxf0XSf3YxCJs6N6AOSrOx3obionmG7T0y0=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/alangpierce/go-forceexport v0.0.0-20160317203124-8f1d6941cd75 h1:3ILjVyslFbc4jl1w5TWuvvslFD/nDfR2H8tVaMVLrEY=
github.com/alangpierce/go-forceexport v0.0.0-20160317203124-8f1d6941cd75/go.mod h1:uAXEEpARkRhCZfEvy/y0Jcc888f9tHCc1W7/UeEtreE=
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 14:48:06 +02:00
github.com/alecthomas/kingpin v2.2.6+incompatible h1:5svnBTFgJjZvGKyYBtMB0+m5wvrbUHiqye8wRJMlnYI=
github.com/alecthomas/kingpin v2.2.6+incompatible/go.mod h1:59OFYbFVLKQKq+mqrL6Rw5bR0c3ACQaawgXx0QYndlE=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
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
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4 h1:Hs82Z41s6SdL1CELW+XaDYmOH4hkBN4/N9og/AsOv7E=
github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
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
github.com/apex/log v1.1.1 h1:BwhRZ0qbjYtTob0I+2M+smavV0kOC8XgcnGZcyL9liA=
github.com/apex/log v1.1.1/go.mod h1:Ls949n1HFtXfbDcjiTTFQqkVUrte0puoIBfO3SVgwOA=
github.com/aphistic/golf v0.0.0-20180712155816-02c07f170c5a/go.mod h1:3NqKYiepwy8kCu4PNA+aP7WUV72eXWJeP9/r3/K9aLE=
github.com/aphistic/sweet v0.2.0/go.mod h1:fWDlIh/isSE9n6EPsRmC0det+whmX6dJid3stzu0Xys=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/araddon/dateparse v0.0.0-20190622164848-0fb0a474d195/go.mod h1:SLqhdZcd+dF3TEVL2RMoob5bBP5R1P1qkox+HtCBgGI=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/aristanetworks/fsnotify v1.4.2/go.mod h1:D/rtu7LpjYM8tRJphJ0hUBYpjai8SfX+aSNsWDTq/Ks=
github.com/aristanetworks/glog v0.0.0-20180419172825-c15b03b3054f/go.mod h1:KASm+qXFKs/xjSoWn30NrWBBvdTTQq+UjkhjEJHfSFA=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/aristanetworks/goarista v0.0.0-20200124011733-f6bb3fedfb04 h1:7GX30sa84yFeSNranBVw+1cNAjFNxEpq4IDWZFwmh14=
github.com/aristanetworks/goarista v0.0.0-20200124011733-f6bb3fedfb04/go.mod h1:Z4RTxGAuYhPzcq8+EdRM+R8M48Ssle2TsWtwRKa+vns=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/aristanetworks/splunk-hec-go v0.3.3/go.mod h1:1VHO9r17b0K7WmOlLb9nTk/2YanvOEnLMUgsFrxBROc=
Upgrade to ooni/probe-engine@v0.1.1 (#60)
2019-10-03 09:43:25 +02:00
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/armon/go-proxyproto v0.0.0-20180202201750-5b7edb60ff5f h1:SaJ6yqg936TshyeFZqQE+N+9hYkIeL9AMr7S4voCl10=
github.com/armon/go-proxyproto v0.0.0-20180202201750-5b7edb60ff5f/go.mod h1:QmP9hvJ91BbJmGVGSbutW19IC0Q9phDCLGaomwTJbgU=
go.mod go.sum: update all direct dependencies
2019-12-26 17:51:31 +01:00
github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
Use ooni/probe-engine: episode 1 (#42)
2019-05-23 16:38:46 +02:00
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/avast/retry-go v2.4.3+incompatible h1:c/FTk2POrEQyZfaHBMkMrXdu3/6IESJUHwu8r3k1JEU=
github.com/avast/retry-go v2.4.3+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY=
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
github.com/aws/aws-sdk-go v1.20.6/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
go.mod go.sum: update all direct dependencies
2019-12-26 17:51:31 +01:00
github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/bifurcation/mint v0.0.0-20180306135233-198357931e61 h1:BU+NxuoaYPIvvp8NNkNlLr8aA0utGyuunf4Q3LJ0bh0=
github.com/bifurcation/mint v0.0.0-20180306135233-198357931e61/go.mod h1:zVt7zX3K/aDCk9Tj+VM7YymsX66ERvzCJzw8rFCX2JU=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4=
Use ooni/probe-engine: episode 1 (#42)
2019-05-23 16:38:46 +02:00
github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/certifi/gocertifi v0.0.0-20200104152315-a6d78f326758 h1:epkmRmrjzR0Km6DrVMk/ZQwDdMY2w31I3kQT91DbxS0=
github.com/certifi/gocertifi v0.0.0-20200104152315-a6d78f326758/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE=
github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/cognusion/go-cache-lru v0.0.0-20170419142635-f73e2280ecea h1:9C2rdYRp8Vzwhm3sbFX0yYfB+70zKFRjn7cnPCucHSw=
github.com/cognusion/go-cache-lru v0.0.0-20170419142635-f73e2280ecea/go.mod h1:MdyNkAe06D7xmJsf+MsLvbZKYNXuOHLKJrvw+x4LlcQ=
Upgrade to ooni/probe-engine@v0.1.1 (#60)
2019-10-03 09:43:25 +02:00
github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/creack/goselect v0.0.0-20160714172859-1bd5ca702c61 h1:T/S5GeXYV5O0wg3dbi+sxqvvSMAt2sOKodHjQkZUWNY=
github.com/creack/goselect v0.0.0-20160714172859-1bd5ca702c61/go.mod h1:gHrIcH/9UZDn2qgeTUeW5K9eZsVYCH6/60J/FHysWyE=
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 14:48:06 +02:00
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/dchest/siphash v1.2.1 h1:4cLinnzVJDKxTCl9B01807Yiy+W7ZzVHj/KIroQRvT4=
github.com/dchest/siphash v1.2.1/go.mod h1:q+IRvb2gOSrUnYoPqHiyHXS0FOBBOdl6tONBlVnOnt4=
github.com/deckarep/golang-set v0.0.0-20171013212420-1d4478f51bed h1:njG8LmGD6JCWJu4bwIKmkOHvch70UOEIqczl5vp7Gok=
github.com/deckarep/golang-set v0.0.0-20171013212420-1d4478f51bed/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ=
go.mod go.sum: update all direct dependencies
2019-12-26 17:51:31 +01:00
github.com/denisenkom/go-mssqldb v0.0.0-20191001013358-cfbb681360f0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/dgraph-io/badger v1.5.4-0.20180815194500-3a87f6d9c273 h1:45qZ7jowabqhyi3l9Ervox4dhQvLGB5BJPdC8w0a77k=
github.com/dgraph-io/badger v1.5.4-0.20180815194500-3a87f6d9c273/go.mod h1:VZxzAIRPHRVNRKRo6AXrX9BJegn6il06VMTZVJYCIjQ=
github.com/dgryski/go-farm v0.0.0-20180109070241-2de33835d102 h1:afESQBXJEnj3fu+34X//E8Wg3nEbMJxJkwSc0tPePK0=
github.com/dgryski/go-farm v0.0.0-20180109070241-2de33835d102/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw=
github.com/dsnet/compress v0.0.1 h1:PlZu0n3Tuv04TzpfPbrnI0HW/YwodEXDS+oPKahKF0Q=
github.com/dsnet/compress v0.0.1/go.mod h1:Aw8dCMJ7RioblQeTqt88akK31OvO8Dhf5JflhBbQEHo=
github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
Use ooni/probe-engine: episode 1 (#42)
2019-05-23 16:38:46 +02:00
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU=
github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/elazarl/goproxy v0.0.0-20171101143503-a96fa3a31826 h1:C0fzkSk9AgMlLF2WiNwwRUy0nIlJjqp8yf1KdmH/bZs=
github.com/elazarl/goproxy v0.0.0-20171101143503-a96fa3a31826/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
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 14:48:06 +02:00
github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s=
github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
Use ooni/probe-engine: episode 1 (#42)
2019-05-23 16:38:46 +02:00
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/garyburd/redigo v1.6.0/go.mod h1:NR3MbYisc3/PwhQ00EMzDiPmrwpPxAn5GI05/YaO1SY=
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 14:48:06 +02:00
github.com/getsentry/raven-go v0.0.0-20190419175539-919484f041ea h1:vpAHg3H71YFc5TqRSqbhMq8Wd0kdPoQMMAeQSgnUTpg=
github.com/getsentry/raven-go v0.0.0-20190419175539-919484f041ea/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
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
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
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 14:48:06 +02:00
github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/go-test/deep v1.0.4/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
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 14:48:06 +02:00
github.com/gobuffalo/envy v1.7.0 h1:GlXgaiBkmrYMHco6t4j7SacKO4XUjvh5pwXh0f4uxXU=
github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
go.mod go.sum: update all direct dependencies
2019-12-26 17:51:31 +01:00
github.com/gobuffalo/envy v1.7.1 h1:OQl5ys5MBea7OGCdvPbBJWRgnhC/fGona6QKfvFeau8=
github.com/gobuffalo/envy v1.7.1/go.mod h1:FurDp9+EDPE4aIUS3ZLyD+7/9fpx7YRt/ukY6jIHf0w=
github.com/gobuffalo/logger v1.0.1 h1:ZEgyRGgAm4ZAhAO45YXMs5Fp+bzGLESFewzAVBMKuTg=
github.com/gobuffalo/logger v1.0.1/go.mod h1:2zbswyIUa45I+c+FLXuWl9zSWEiVuthsk8ze5s8JvPs=
github.com/gobuffalo/packd v0.3.0 h1:eMwymTkA1uXsqxS0Tpoop3Lc0u3kTfiMBE6nKtQU4g4=
github.com/gobuffalo/packd v0.3.0/go.mod h1:zC7QkmNkYVGKPw4tHpBQ+ml7W/3tIebgeo1b36chA3Q=
github.com/gobuffalo/packr/v2 v2.7.1 h1:n3CIW5T17T8v4GGK5sWXLVWJhCz7b5aNLSxW6gYim4o=
github.com/gobuffalo/packr/v2 v2.7.1/go.mod h1:qYEvAazPaVxy7Y7KR0W8qYEE+RymX74kETFqjFoFlOc=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/gobwas/glob v0.2.4-0.20180402141543-f00a7392b439 h1:T6zlOdzrYuHf6HUKujm9bzkzbZ5Iv/xf6rs8BHZDpoI=
github.com/gobwas/glob v0.2.4-0.20180402141543-f00a7392b439/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
go.mod go.sum: update all direct dependencies
2019-12-26 17:51:31 +01:00
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
github.com/golang/mock v1.3.1 h1:qGJ6qTW+x6xX/my+8YUVl4WNpX9B7+/l2tRsHGZ7f2s=
github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
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 14:48:06 +02:00
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/golang/protobuf v1.3.0/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a1/R87v0=
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
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
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
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
Use ooni/probe-engine: episode 1 (#42)
2019-05-23 16:38:46 +02:00
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/gxui v0.0.0-20151028112939-f85e0a97b3a4 h1:OL2d27ueTKnlQJoqLW2fc9pWYulFnJYLWzomGV7HqZo=
Use ooni/probe-engine: episode 1 (#42)
2019-05-23 16:38:46 +02:00
github.com/google/gxui v0.0.0-20151028112939-f85e0a97b3a4/go.mod h1:Pw1H1OjSNHiqeuxAduB1BKYXIwFtsyrY47nEqSgEiCM=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
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
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
github.com/googleapis/google-cloud-go-testing v0.0.0-20191008195207-8e1d251e947d/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
Use ooni/probe-engine: episode 1 (#42)
2019-05-23 16:38:46 +02:00
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
Use ooni/probe-engine: episode 1 (#42)
2019-05-23 16:38:46 +02:00
github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
Upgrade to ooni/probe-engine@v0.1.1 (#60)
2019-10-03 09:43:25 +02:00
github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/grafov/m3u8 v0.0.0-20171211212457-6ab8f28ed427 h1:xh96CCAZTX8LJPFoOVRgTwZbn2DvJl8fyCyivohhSIg=
github.com/grafov/m3u8 v0.0.0-20171211212457-6ab8f28ed427/go.mod h1:PdjzaU/pJUo4jTIn2rcgMFs+HqBGl/sPJLr8BI0Xq/I=
go.mod go.sum: update all direct dependencies
2019-12-26 17:51:31 +01:00
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU=
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
Upgrade to ooni/probe-engine@v0.1.1 (#60)
2019-10-03 09:43:25 +02:00
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
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 14:48:06 +02:00
github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174 h1:WlZsjVhE8Af9IcZDGgJGQpNflI3+MJSBhsgT5PCtzBQ=
github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod h1:DqJ97dSdRW1W22yXSB90986pcOyQ7r45iio1KN2ez1A=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
Use ooni/probe-engine: episode 1 (#42)
2019-05-23 16:38:46 +02:00
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
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 14:48:06 +02:00
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/influxdata/influxdb1-client v0.0.0-20190809212627-fc22c7df067e/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o=
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
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
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 14:48:06 +02:00
github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
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
github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod h1:2iMrUgbbvHEiQClaW2NsSzMyGHqN+rDFqY705q49KG0=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
Use ooni/probe-engine: episode 1 (#42)
2019-05-23 16:38:46 +02:00
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/juju/ratelimit v1.0.2-0.20191002062651-f60b32039441 h1:b5Jqi7ir58EzfeZDyp7OSYQG/IVgyY4JWfHuJUF2AZI=
github.com/juju/ratelimit v1.0.2-0.20191002062651-f60b32039441/go.mod h1:qapgC/Gy+xNh9UxzV13HGGl/6UXNN+ct+vwSgWNm/qk=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
github.com/kabukky/httpscerts v0.0.0-20150320125433-617593d7dcb3/go.mod h1:BYpt4ufZiIGv2nXn4gMxnfKV306n3mWXgNu/d2TqdTU=
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 14:48:06 +02:00
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
github.com/klauspost/reedsolomon v1.9.2/go.mod h1:CwCi+NUr9pqSVktrkN+Ondf06rkhYZ/pcNv7fu+8Un4=
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 14:48:06 +02:00
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s=
Upgrade to ooni/probe-engine@v0.1.1 (#60)
2019-10-03 09:43:25 +02:00
github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
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
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
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 14:48:06 +02:00
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs=
github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
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 14:48:06 +02:00
github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
go.mod go.sum: update all direct dependencies
2019-12-26 17:51:31 +01:00
github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0=
github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/m-lab/go v1.2.0 h1:tIYz23bGCuw1AH7wl5h+vAJ5VV1aXgo9Zbl+Evkdp/o=
github.com/m-lab/go v1.2.0/go.mod h1:FcVx/N8dL5J5TVQ2L0d8/cAw/ljR6fhwZqvqZHrb5/Q=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/m-lab/go v1.2.2 h1:x9e7P08ZpdcxVOpHbgw9NFjIds2pqYJtsaiDXYaN4fM=
github.com/m-lab/go v1.2.2/go.mod h1:f22d1CtoFIho8yt0wPNYo0Lx5h8YfgRW4+1pzQTeQRw=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/m-lab/ndt-server v0.13.4 h1:0rjWbZsor6/CRxOMlWxWEq1I7GUWrNCTM6//OFNC3Yo=
github.com/m-lab/ndt-server v0.13.4/go.mod h1:ZLVRCEbCBkhh0pwNjnLpwaZnHOHGEH76H/fzIIVFRWw=
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
github.com/m-lab/ndt7-client-go v0.0.0-20190724152841-ad7eefc52fe1/go.mod h1:nD9WTkxP4/mV2ph5uUpVPD2ZOJdZ9QKPTKu3tJGkM9o=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/m-lab/ndt7-client-go v0.2.0 h1:I+BV/F9/52wh2czIFULsJjyd4N7kKjwGFMpvCykLNaY=
github.com/m-lab/ndt7-client-go v0.2.0/go.mod h1:dPCMzEUyVKj/RT8+42LXOFvvioHxcNsesRAFkaq3NjY=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/m-lab/tcp-info v1.3.0 h1:bL8ElOp5Sxc5e1W86swMv5zjh6/y1Y9qT7eEOgJnzq4=
github.com/m-lab/tcp-info v1.3.0/go.mod h1:bkvI4qbjB6QVC2tsLSHqf5OnIYcmuLEVjo7+8YA56Kg=
Upgrade to ooni/probe-engine@v0.1.1 (#60)
2019-10-03 09:43:25 +02:00
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/marten-seemann/chacha20 v0.2.0 h1:f40vqzzx+3GdOmzQoItkLX5WLvHgPgyYqFFIO5Gh4hQ=
github.com/marten-seemann/chacha20 v0.2.0/go.mod h1:HSdjFau7GzYRj+ahFNwsO3ouVJr1HFkWoEwNDb4TMtE=
github.com/marten-seemann/qpack v0.1.0 h1:/0M7lkda/6mus9B8u34Asqm8ZhHAAt9Ho0vniNuVSVg=
github.com/marten-seemann/qpack v0.1.0/go.mod h1:LFt1NU/Ptjip0C2CPkhimBz5CGE3WGDAUWqna+CNTrI=
github.com/marten-seemann/qtls v0.4.1 h1:YlT8QP3WCCvvok7MGEZkMldXbyqgr8oFg5/n8Gtbkks=
github.com/marten-seemann/qtls v0.4.1/go.mod h1:pxVXcHHw1pNIt8Qo0pwSYQEoZ8yYOOPXTCZLQQunvRc=
github.com/marusama/semaphore v0.0.0-20171214154724-565ffd8e868a h1:6SRny9FLB1eWasPyDUqBQnMi9NhXU01XIlB0ao89YoI=
github.com/marusama/semaphore v0.0.0-20171214154724-565ffd8e868a/go.mod h1:TmeOqAKoDinfPfSohs14CO3VcEf7o+Bem6JiNe05yrQ=
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 14:48:06 +02:00
github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4=
github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
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
github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
go.mod go.sum: update all direct dependencies
2019-12-26 17:51:31 +01:00
github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA=
github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
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 14:48:06 +02:00
github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
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
github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE=
github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
go.mod go.sum: update all direct dependencies
2019-12-26 17:51:31 +01:00
github.com/mattn/go-isatty v0.0.11 h1:FxPOTFNqGkuDUGi3H/qkUbQO4ZiBa2brKq5r0l8TGeM=
github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
github.com/mattn/go-sqlite3 v1.12.0 h1:u/x3mp++qUxvYfulZ4HKOvVO0JWhk7HtE8lWhbGz/Do=
github.com/mattn/go-sqlite3 v1.12.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
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 14:48:06 +02:00
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b h1:j7+1HpAFS1zy5+Q4qx1fWh90gTKwiN4QCGoY9TWyyO4=
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/miekg/dns v1.1.27 h1:aEH/kqUzUxGJ/UHcEKdJY+ugH6WEzsEBBSPa8zuy1aM=
github.com/miekg/dns v1.1.27/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
go.mod go.sum: update all direct dependencies
2019-12-26 17:51:31 +01:00
github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
Upgrade to ooni/probe-engine@v0.1.1 (#60)
2019-10-03 09:43:25 +02:00
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
github.com/montanaflynn/stats v0.5.0 h1:2EkzeTSqBB4V4bJwWrt5gIIrZmpJBcoIRGS2kWLgzmk=
github.com/montanaflynn/stats v0.5.0/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/neubot/dash v0.4.1 h1:kxidcFmfn+Do48EMt2Xy0aXTz64jEccZLDfstOcjqng=
github.com/neubot/dash v0.4.1/go.mod h1:fK/+loFrkzcP/nHerLcaiZs+RDC6SPqZIOEDZXChiSs=
go.mod go.sum: update all direct dependencies
2019-12-26 17:51:31 +01:00
github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
github.com/olekukonko/tablewriter v0.0.2/go.mod h1:rSAaSIOAGT9odnlyGlUfAJaoc5w2fSBUmeGDbRWPxyQ=
Use ooni/probe-engine: episode 1 (#42)
2019-05-23 16:38:46 +02:00
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo=
Use ooni/probe-engine: episode 1 (#42)
2019-05-23 16:38:46 +02:00
github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/ooni/netx v0.0.0-20200113102411-24ca17149d15 h1:IKvGfOA18bM66tZdy9Thnw2ea6bWRnyefkN4eJEvLVQ=
github.com/ooni/netx v0.0.0-20200113102411-24ca17149d15/go.mod h1:vTJ7nYH2j51lX8yvhdLaHscvwz1GvWoiB26jYKEmqyA=
go.mod go.sum: pin to latest probe-engine with summary for tor At this stage is fine to just pin to the latest master. I am planning on blessing periodic releases and it's fine to pin sometimes. I'm pinning this specific version because it currently supports the summary for experiment/tor, which @sarathms would benefit from.
2020-01-30 18:12:53 +01:00
github.com/ooni/probe-engine v0.5.1-0.20200130170101-82d287d3fa55 h1:7Jfcsrt531+DrB+ktkTypRrpkxCEbfqdWNHjo6IqlmM=
github.com/ooni/probe-engine v0.5.1-0.20200130170101-82d287d3fa55/go.mod h1:APrWhUMGtwSuCgFEwor5em22K7hqXsW4rcLIend99d8=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/openconfig/gnmi v0.0.0-20190823184014-89b2bf29312c/go.mod h1:t+O9It+LKzfOAhKTT5O0ehDix+MTqbtT0T9t+7zzOvc=
github.com/openconfig/reference v0.0.0-20190727015836-8dfd928c9696/go.mod h1:ym2A+zigScwkSEb/cVQB0/ZMpU3rqiH6X7WRRsxgOGw=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/oschwald/geoip2-golang v1.4.0 h1:5RlrjCgRyIGDz/mBmPfnAF4h8k0IAcRv9PvrpOfz+Ug=
github.com/oschwald/geoip2-golang v1.4.0/go.mod h1:8QwxJvRImBH+Zl6Aa6MaIcs5YdlZSTKtzmPGzQqi9ng=
github.com/oschwald/maxminddb-golang v1.6.0 h1:KAJSjdHQ8Kv45nFIbtoLGrGWqHFajOIm7skTyz/+Dls=
github.com/oschwald/maxminddb-golang v1.6.0/go.mod h1:DUJFucBg2cvqx42YmDa/+xHvb0elJtOm3o4aFQ/nb/w=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
Use ooni/probe-engine: episode 1 (#42)
2019-05-23 16:38:46 +02:00
github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
github.com/pborman/getopt v0.0.0-20190409184431-ee0cd42419d3/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o=
Upgrade to ooni/probe-engine@v0.1.1 (#60)
2019-10-03 09:43:25 +02:00
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/pierrec/lz4 v0.0.0-20190327172049-315a67e90e41/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc=
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 14:48:06 +02:00
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA=
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 14:48:06 +02:00
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
go.mod go.sum: update all direct dependencies
2019-12-26 17:51:31 +01:00
github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/client_model v0.1.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
github.com/prometheus/prometheus v2.5.0+incompatible/go.mod h1:oAIUtOny2rjMX0OWN5vPR5/q/twIROJvdqnQKDdil/s=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/redjack/marionette v0.0.0-20180818172807-360dd8f58226 h1:8+dAj8X8Lmdud1X36mBJ6Jbi93Pm3DLff9Z2t73QjHw=
github.com/redjack/marionette v0.0.0-20180818172807-360dd8f58226/go.mod h1:yJd0pT0e04p+VSmLGjce8BoPlRDlrGrdfXf2En7oq9A=
github.com/refraction-networking/gotapdance v0.0.0-20190909202946-3a6e1938ad70 h1:EUwVKYIxba8xd9YeCG+63W2HiwKDPIw92F4pccOmXug=
github.com/refraction-networking/gotapdance v0.0.0-20190909202946-3a6e1938ad70/go.mod h1:iBzxMSHu9kVV7v3Rc6vcDVCUDLsRGqLL3vtiR74JBvk=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/refraction-networking/utls v0.0.0-20190909200633-43c36d3c1f57 h1:SL1K0QAuC1b54KoY1pjPWe6kSlsFHwK9/oC960fKrTY=
github.com/refraction-networking/utls v0.0.0-20190909200633-43c36d3c1f57/go.mod h1:tz9gX959MEFfFN5whTIocCLUG57WiILqtdVxI8c6Wj0=
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
github.com/rogpeppe/fastuuid v1.1.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
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 14:48:06 +02:00
github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/rogpeppe/go-internal v1.3.0 h1:RR9dF3JtopPvtkroDZuVD7qquD0bnHlKSqaQhgwt8yk=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
go.mod go.sum: update all direct dependencies
2019-12-26 17:51:31 +01:00
github.com/rogpeppe/go-internal v1.3.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
github.com/rogpeppe/go-internal v1.4.0 h1:LUa41nrWTQNGhzdsZ5lTnkwbNjj6rXTdazA1cSdjkOY=
github.com/rogpeppe/go-internal v1.4.0/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/rogpeppe/go-internal v1.5.2 h1:qLvObTrvO/XRCqmkKxUlOBc48bI3efyDuAZe25QiF0w=
github.com/rogpeppe/go-internal v1.5.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
github.com/rubenv/sql-migrate v0.0.0-20200119084958-8794cecc920c h1:6dFcHMxrVcjjYJHg+u9YjcqRaXKSniRsGCHTn0PzaQM=
github.com/rubenv/sql-migrate v0.0.0-20200119084958-8794cecc920c/go.mod h1:rtQlpHw+eR6UrqaS3kX1VYeaCxzCVdimDS7g5Ln4pPc=
Upgrade to ooni/probe-engine@v0.1.1 (#60)
2019-10-03 09:43:25 +02:00
github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735 h1:7YvPJVmEeFHR1Tj9sZEYsmarJEQfMVYpd/Vyy/A8dqE=
github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/sergeyfrolov/bsbuffer v0.0.0-20180903213811-94e85abb8507 h1:ML7ZNtcln5UBo5Wv7RIv9Xg3Pr5VuRCWLFXEwda54Y4=
Use ooni/probe-engine: episode 1 (#42)
2019-05-23 16:38:46 +02:00
github.com/sergeyfrolov/bsbuffer v0.0.0-20180903213811-94e85abb8507/go.mod h1:DbI1gxrXI2jRGw7XGEUZQOOMd6PsnKzRrCKabvvMrwM=
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
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
Use ooni/probe-engine: episode 1 (#42)
2019-05-23 16:38:46 +02:00
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/smartystreets/assertions v1.0.0 h1:UVQPSSmc3qtTi+zPPkCXvZX9VvW/xT/NsRvKfwY81a8=
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
github.com/smartystreets/assertions v1.0.0/go.mod h1:kHHU4qYBaI3q23Pp3VPrmWhuIUrLW/7eUrw0BU5VaoM=
github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
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
github.com/smartystreets/gunit v1.0.0/go.mod h1:qwPWnhz6pn0NnRBP++URONOVyNkPyr4SauJk4cUOwJs=
Upgrade to ooni/probe-engine@v0.1.1 (#60)
2019-10-03 09:43:25 +02:00
github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
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 14:48:06 +02:00
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
Upgrade to ooni/probe-engine@v0.1.1 (#60)
2019-10-03 09:43:25 +02:00
github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
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 14:48:06 +02:00
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8 h1:zLV6q4e8Jv9EHjNg/iHfzwDkCve6Ua5jCygptrtXHvI=
github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161/go.mod h1:wM7WEvslTq+iOEAMDLSzhVuOt5BRZ05WirO+b09GHQU=
github.com/templexxx/xor v0.0.0-20181023030647-4e92f724b73b/go.mod h1:5XA7W9S6mni3h5uvOC75dA3m9CCCaS83lltmc0ukdi4=
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
github.com/tj/assert v0.0.0-20171129193455-018094318fb0/go.mod h1:mZ9/Rh9oLWpLLDRpvE+3b7gP/C2YyLFYxNmcLnPTMe0=
github.com/tj/go-elastic v0.0.0-20171221160941-36157cbbebc2/go.mod h1:WjeM0Oo1eNAjXGDx2yma7uG2XoyRZTq1uv3M/o7imD0=
github.com/tj/go-kinesis v0.0.0-20171128231115-08b17f58cb1b/go.mod h1:/yhzCV0xPfx6jb1bBgRFjl5lytqVqZXEaeqWP8lTEao=
github.com/tj/go-spin v1.1.0/go.mod h1:Mg1mzmePZm4dva8Qz60H2lHwmJ2loum4VIrLgVnKwh4=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/tjfoc/gmsm v1.0.1/go.mod h1:XxO4hdhhrzAd+G4CjDqaOkd0hUzmtPR/d3EiBBMn/wc=
Upgrade to ooni/probe-engine@v0.1.1 (#60)
2019-10-03 09:43:25 +02:00
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
Upgrade to ooni/probe-engine@v0.1.1 (#60)
2019-10-03 09:43:25 +02:00
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
github.com/xtaci/kcp-go v5.4.5+incompatible/go.mod h1:bN6vIwHQbfHaHtFpEssmWsN45a+AZwO7eyRCmEIbtvE=
github.com/xtaci/lossyconn v0.0.0-20190602105132-8df528c0c9ae/go.mod h1:gXtu8J62kEgmN++bm9BVICuT/e8yiLI2KFobd/TRFsE=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
github.com/zach-klippenstein/goregen v0.0.0-20160303162051-795b5e3961ea h1:CyhwejzVGvZ3Q2PSbQ4NRRYn+ZWv5eS1vlaEusT+bAI=
Use ooni/probe-engine: episode 1 (#42)
2019-05-23 16:38:46 +02:00
github.com/zach-klippenstein/goregen v0.0.0-20160303162051-795b5e3961ea/go.mod h1:eNr558nEUjP8acGw8FFjTeWvSgU1stO7FAO6eknhHe4=
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 14:48:06 +02:00
github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs=
github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
gitlab.com/yawning/obfs4.git v0.0.0-20190621002404-c357dd56dfa6 h1:nqCHIuN9U/kSzwPs3PC2LXiJftKrPaRhzx43Ml9JWfA=
gitlab.com/yawning/obfs4.git v0.0.0-20190621002404-c357dd56dfa6/go.mod h1:3pn2QYDNL2wbsdyAgAhKdaCbQt/u/qx1HwuI5QoMUfk=
gitlab.com/yawning/utls.git v0.0.11-1 h1:cQLJ4sN+u07Rn9M7RpvCEWUPndtrsQsy6U3ZaEHeDvI=
gitlab.com/yawning/utls.git v0.0.11-1/go.mod h1:eYdrOOCoedNc3xw50kJ/s8JquyxeS5kr3vkFZFPTI9w=
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
go.uber.org/atomic v1.3.3-0.20180806045314-ca680462431f h1:K08/x8x05SAF9B8rXa3M392TPFlViAjwjdS2/7qnr2g=
go.uber.org/atomic v1.3.3-0.20180806045314-ca680462431f/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
go.uber.org/multierr v1.1.1-0.20180122172545-ddea229ff1df h1:ijDSp1iOMDAWixcZLxdmOBE0N7YTvtV4s2HWE3U1CoQ=
go.uber.org/multierr v1.1.1-0.20180122172545-ddea229ff1df/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
go.uber.org/zap v1.9.2-0.20180814183419-67bc79d13d15 h1:0yi2i4dLbYtFqehls82kppDGdgRCYhsK1XaO0dOQRSg=
go.uber.org/zap v1.9.2-0.20180814183419-67bc79d13d15/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
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 14:48:06 +02:00
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
Upgrade to ooni/probe-engine@v0.1.1 (#60)
2019-10-03 09:43:25 +02:00
golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
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 14:48:06 +02:00
golang.org/x/crypto v0.0.0-20190123085648-057139ce5d2b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
go.mod go.sum: update all direct dependencies
2019-12-26 17:51:31 +01:00
golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
golang.org/x/crypto v0.0.0-20190404164418-38d8ce5564a5/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
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
golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
go.mod go.sum: update all direct dependencies
2019-12-26 17:51:31 +01:00
golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876 h1:sKJQZMuxjOAR/Uo2LBfU90onWEf1dF4C+0hPJCc9Mpc=
golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
Use ooni/probe-engine: episode 1 (#42)
2019-05-23 16:38:46 +02:00
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190228165749-92fc7df08ae7/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
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 14:48:06 +02:00
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
golang.org/x/net v0.0.0-20190328230028-74de082e2cca/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
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
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
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
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
Upgrade to ooni/probe-engine@v0.1.1 (#60)
2019-10-03 09:43:25 +02:00
golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
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
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
golang.org/x/net v0.0.0-20190912160710-24e19bdeb0f2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 h1:efeOvDhwQ29Dj3SdAV/MJf8oukgn+8D8WgaCaRMchF8=
golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
Use ooni/probe-engine: episode 1 (#42)
2019-05-23 16:38:46 +02:00
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
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
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
go.mod go.sum: update all direct dependencies
2019-12-26 17:51:31 +01:00
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
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 14:48:06 +02:00
golang.org/x/sys v0.0.0-20180606202747-9527bec2660b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
go.mod go.sum: update all direct dependencies
2019-12-26 17:51:31 +01:00
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
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 14:48:06 +02:00
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
Use ooni/probe-engine: episode 1 (#42)
2019-05-23 16:38:46 +02:00
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
Upgrade to ooni/probe-engine@v0.1.1 (#60)
2019-10-03 09:43:25 +02:00
golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
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 14:48:06 +02:00
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190329044733-9eb1bfa1ce65/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
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
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
Use ooni/probe-engine: episode 1 (#42)
2019-05-23 16:38:46 +02:00
golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
go.mod go.sum: update all direct dependencies
2019-12-26 17:51:31 +01:00
golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
golang.org/x/sys v0.0.0-20190801041406-cbf593c0f2f3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
golang.org/x/sys v0.0.0-20190912141932-bc967efca4b8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
go.mod go.sum: update all direct dependencies
2019-12-26 17:51:31 +01:00
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
go.mod go.sum: update all direct dependencies
2019-12-26 17:51:31 +01:00
golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200107162124-548cf772de50 h1:YvQ10rzcqWXLlJZ3XCUoO25savxmscf4+SC+ZqiCHhA=
golang.org/x/sys v0.0.0-20200107162124-548cf772de50/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
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 14:48:06 +02:00
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
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
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
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
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
Use ooni/probe-engine: episode 1 (#42)
2019-05-23 16:38:46 +02:00
golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
golang.org/x/tools v0.0.0-20190912185636-87d9f09c5d89/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
go.mod go.sum: update all direct dependencies
2019-12-26 17:51:31 +01:00
golang.org/x/tools v0.0.0-20191004055002-72853e10c5a3/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
go.mod go.sum: update all direct dependencies
2019-12-26 17:51:31 +01:00
google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM=
google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
go.mod go.sum: update all direct dependencies
2019-12-26 17:51:31 +01:00
gopkg.in/AlecAivazis/survey.v1 v1.8.7 h1:oBJqtgsyBLg9K5FK9twNUbcPnbCPoh+R9a+7nag3qJM=
gopkg.in/AlecAivazis/survey.v1 v1.8.7/go.mod h1:iBNOmqKz/NUbZx3bA+4hAGLRC7fSK7tgtVDT4tB22XA=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
gopkg.in/bsm/ratelimit.v1 v1.0.0-20160220154919-db14e161995a/go.mod h1:KF9sEfUPAXdG8Oev9e99iLGnl2uJMjc5B+4y3O7x610=
Use ooni/probe-engine: episode 1 (#42)
2019-05-23 16:38:46 +02:00
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
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 14:48:06 +02:00
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
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 14:48:06 +02:00
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
Use ooni/probe-engine: episode 1 (#42)
2019-05-23 16:38:46 +02:00
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
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 14:48:06 +02:00
gopkg.in/gorp.v1 v1.7.2 h1:j3DWlAyGVv8whO7AcIWznQ2Yj7yJkn34B8s63GViAAw=
gopkg.in/gorp.v1 v1.7.2/go.mod h1:Wo3h+DBQZIxATwftsglhdD/62zRFPhGhTiu5jUJmCaw=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
gopkg.in/jcmturner/aescts.v1 v1.0.1/go.mod h1:nsR8qBOg+OucoIW+WMhB3GspUQXq9XorLnQb9XtvcOo=
gopkg.in/jcmturner/dnsutils.v1 v1.0.1/go.mod h1:m3v+5svpVOhtFAP/wSz+yzh4Mc0Fg7eRhxkJMWSIz9Q=
gopkg.in/jcmturner/goidentity.v3 v3.0.0/go.mod h1:oG2kH0IvSYNIu80dVAyu/yoefjq1mNfM5bm88whjWx4=
gopkg.in/jcmturner/gokrb5.v7 v7.2.3/go.mod h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuvyavf11/WM=
gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod h1:YIdkC4XfD6GXbzje11McwsDuOlZQSb9W4vfLvuNnlv8=
go.mod go.sum: update all direct dependencies
2019-12-26 17:51:31 +01:00
gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 h1:VpOs+IwYnYBaFnrNAeB8UUWtL3vEUnzSCL1nVjPhqrw=
gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
gopkg.in/redis.v4 v4.2.4/go.mod h1:8KREHdypkCEojGKQcjMqAODMICIVwZAONWq8RowTITA=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
Use ooni/probe-engine: episode 1 (#42)
2019-05-23 16:38:46 +02:00
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
Use more general ooni/probe-engine API (#67) No functional change, just importing less stuff and meddling much less with the internals of ooni/probe-engine.
2019-10-28 14:05:05 +01:00
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
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
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
go.mod go.sum: update all direct dependencies
2019-12-26 17:51:31 +01:00
gopkg.in/yaml.v2 v2.2.5 h1:ymVxjfMaHvXD8RqPRmzHHsB3VvucivSkIAvJFDI5O3c=
gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo=
gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
Update to ooni/probe-engine@v0.3.0 1. `go get -u github.com/ooni/probe-engine@v0.3.0` 2. `go mod tidy` 3. fix build failures
2019-12-26 17:48:10 +01:00
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
circumvention: add the tor experiment (#100) * go.mod go.sum: update all non-probe-engine deps For each line in the go.mod, run `go get -u -v $package` if the line is not an indirect dependency and is not probe-engine. Upgrading probe-engine is going to require the same spell that is used in probe-engine to update psiphon. * go get -v github.com/ooni/probe-engine@v0.5.0 This just pins to the latest probe-engine but we've not manually pinned all the other dependencieds yet. Take care of the trivial API changes in probe-engine as well, such that we can have a working build after this commit. * go.mod go.sum: pin to probe-engine dependencies Basically: remove all indirect dependencies. Merge this go.mod with the one of probe-engine, to pin dependencies. Run `go mod tidy`. * circumvention: add basic implementation of tor This needs to be polished further, of course. But at least we have now added support for running tor in the circumvention group. * Readme.md: document how to update dependencies * go get -v github.com/ooni/probe-engine@fcc9ee0a7afb * go get -v github.com/ooni/probe-engine@4d254f5b2 * nettests/tor.go: implement summary test keys
2020-01-28 10:05:54 +01:00
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
go.mod go.sum: update all direct dependencies
2019-12-26 17:51:31 +01:00
upper.io/db.v3 v3.6.3+incompatible h1:SJLWd7H56Vwm4rYa+cHAQDYWcvvOt1C/5PD/IIBZPW8=
upper.io/db.v3 v3.6.3+incompatible/go.mod h1:FgTdD24eBjJAbPKsQSiHUNgXjOR4Lub3u1UMHSIh82Y=
Reference in New Issue Copy Permalink