From b4934b16192c5541aac23efb3015be526ca40ce9 Mon Sep 17 00:00:00 2001 From: Simone Basso Date: Thu, 4 Jun 2020 11:19:38 +0200 Subject: [PATCH] Use ooni/probe-engine 0.12.0+patches (#133) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * nettests/groups.go: remove redundant struct names * go.mod go.sum: update deps except probe-engine * Update to ooni/probe-engine@e768161f91db21f6ce1df7dfa8174c3aaa4bba18 The API has changed. Methods that used to change bits of the session have been removed. Now the session is more immutable than before. As such, we need to completely fill the config before using it. * Set IncludeCountry to always true Co-authored-by: Arturo Filastò --- config/settings.go | 6 +- go.mod | 6 +- go.sum | 64 +++++----------------- internal/cli/geoip/geoip.go | 16 ++++-- internal/cli/run/run.go | 60 ++++++++------------ nettests/dash.go | 2 +- nettests/facebook_messenger.go | 2 +- nettests/groups.go | 10 ++-- nettests/http_header_field_manipulation.go | 2 +- nettests/http_invalid_request_line.go | 2 +- nettests/ndt.go | 2 +- nettests/nettests.go | 11 ++-- nettests/nettests_test.go | 8 ++- nettests/psiphon.go | 2 +- nettests/telegram.go | 2 +- nettests/tor.go | 2 +- nettests/web_connectivity.go | 4 +- nettests/whatsapp.go | 2 +- ooni.go | 45 ++++++++------- 19 files changed, 105 insertions(+), 143 deletions(-) diff --git a/config/settings.go b/config/settings.go index e36a346..e98cf15 100644 --- a/config/settings.go +++ b/config/settings.go @@ -42,13 +42,11 @@ type Sharing struct { // Advanced settings type Advanced struct { - SendCrashReports bool `json:"send_crash_reports"` - CollectorURL string `json:"collector_url"` - BouncerURL string `json:"bouncer_url"` + SendCrashReports bool `json:"send_crash_reports"` } // Nettests related settings type Nettests struct { - WebsitesURLLimit int64 `json:"websites_url_limit"` + WebsitesURLLimit int64 `json:"websites_url_limit"` WebsitesEnabledCategoryCodes []string `json:"websites_enabled_category_codes"` } diff --git a/go.mod b/go.mod index 3455152..cd57570 100644 --- a/go.mod +++ b/go.mod @@ -4,14 +4,14 @@ go 1.14 require ( github.com/alecthomas/kingpin v2.2.6+incompatible - github.com/apex/log v1.1.4 + github.com/apex/log v1.3.0 github.com/fatih/color v1.9.0 github.com/getsentry/raven-go v0.0.0-20190419175539-919484f041ea github.com/mattn/go-colorable v0.1.6 - github.com/ooni/probe-engine v0.11.0 + github.com/ooni/probe-engine v0.12.1-0.20200529160604-e768161f91db github.com/pkg/errors v0.9.1 github.com/rubenv/sql-migrate v0.0.0-20200429072036-ae26b214fa43 gopkg.in/AlecAivazis/survey.v1 v1.8.8 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect - upper.io/db.v3 v3.6.4+incompatible + upper.io/db.v3 v3.7.1+incompatible ) diff --git a/go.sum b/go.sum index 8adf5d6..f5e8751 100644 --- a/go.sum +++ b/go.sum @@ -52,8 +52,8 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4 h1:Hs82Z41s6SdL1C github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= -github.com/apex/log v1.1.4 h1:3Zk+boorIQAAGBrHn0JUtAau4ihMamT4WdnfdnXM1zQ= -github.com/apex/log v1.1.4/go.mod h1:AlpoD9aScyQfJDVHmLMEcx4oU6LqzkWp4Mg9GdAcEvQ= +github.com/apex/log v1.3.0 h1:1fyfbPvUwD10nMoh3hY6MXzvZShJQn9/ck7ATgAt5pA= +github.com/apex/log v1.3.0/go.mod h1:jd8Vpsr46WAe3EZSQ/IUMs2qQD/GOycT5rPWCO1yGcs= github.com/apex/logs v0.0.4/go.mod h1:XzxuLZ5myVHDy9SAmYpamKKRNApGj54PfYLcFrXqDwo= 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= @@ -137,7 +137,6 @@ github.com/elazarl/goproxy v0.0.0-20171101143503-a96fa3a31826/go.mod h1:/Zj4wYkg github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= 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= -github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= 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= @@ -161,7 +160,6 @@ github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG 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= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gobuffalo/envy v1.7.0 h1:GlXgaiBkmrYMHco6t4j7SacKO4XUjvh5pwXh0f4uxXU= github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= 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= @@ -188,7 +186,6 @@ github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfb github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.0/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a1/R87v0= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I= github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= @@ -197,12 +194,11 @@ github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW 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= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= +github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gxui v0.0.0-20151028112939-f85e0a97b3a4 h1:OL2d27ueTKnlQJoqLW2fc9pWYulFnJYLWzomGV7HqZo= github.com/google/gxui v0.0.0-20151028112939-f85e0a97b3a4/go.mod h1:Pw1H1OjSNHiqeuxAduB1BKYXIwFtsyrY47nEqSgEiCM= @@ -215,8 +211,6 @@ github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51 github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM= -github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grafov/m3u8 v0.0.0-20171211212457-6ab8f28ed427 h1:xh96CCAZTX8LJPFoOVRgTwZbn2DvJl8fyCyivohhSIg= @@ -240,7 +234,6 @@ github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= 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= github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= @@ -287,11 +280,9 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxv github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= -github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -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/pty v1.1.4 h1:5Myjjh3JY/NaAi4IsUbHADytDyl1VE1Y9PXDlL+P/VQ= github.com/kr/pty v1.1.4/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -303,14 +294,6 @@ github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= -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= -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= -github.com/m-lab/ndt7-client-go v0.3.0 h1:IpIEbwbd6lTED3PTWnNjPgzxT2DJLbVb66gYWlZFf60= -github.com/m-lab/ndt7-client-go v0.3.0/go.mod h1:dPCMzEUyVKj/RT8+42LXOFvvioHxcNsesRAFkaq3NjY= -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= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/marten-seemann/chacha20 v0.2.0 h1:f40vqzzx+3GdOmzQoItkLX5WLvHgPgyYqFFIO5Gh4hQ= github.com/marten-seemann/chacha20 v0.2.0/go.mod h1:HSdjFau7GzYRj+ahFNwsO3ouVJr1HFkWoEwNDb4TMtE= @@ -320,21 +303,16 @@ github.com/marten-seemann/qtls v0.4.1 h1:YlT8QP3WCCvvok7MGEZkMldXbyqgr8oFg5/n8Gt 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= -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= 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= -github.com/mattn/go-colorable v0.1.4 h1:snbPLB8fVfU9iwbbo30TPtbLRzwWu6aJS6Xh4eaaviA= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= 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= -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-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= @@ -381,12 +359,11 @@ github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo= github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/ooni/probe-engine v0.11.0 h1:1PXPOFyBNn4IOOkhmFFv9GeNxFnbqmX+N+/MdRF/uJI= -github.com/ooni/probe-engine v0.11.0/go.mod h1:mHhEhSjlJY7qMiuOKIVsv6WNYXpDSzh1/tbbMjVPjg4= +github.com/ooni/probe-engine v0.12.1-0.20200529160604-e768161f91db h1:FPpbvR8pLrrkXewpZCkOE4UU2Qqn6bkYLWz9of53nPE= +github.com/ooni/probe-engine v0.12.1-0.20200529160604-e768161f91db/go.mod h1:PigipvcUn71UWONQ3lVO4e+NxW8g/5zSqgimQdj/WNg= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= 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= @@ -414,7 +391,6 @@ github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pierrec/lz4 v2.4.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= 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= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -453,10 +429,8 @@ github.com/refraction-networking/utls v0.0.0-20190909200633-43c36d3c1f57/go.mod github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.1.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= 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= 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= github.com/rogpeppe/go-internal v1.6.0 h1:IZRgg4sfrDH7nsAD1Y/Nwj+GzIfEwpJSLjCaNC3SbsI= github.com/rogpeppe/go-internal v1.6.0/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= @@ -501,7 +475,6 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ 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= github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -509,6 +482,7 @@ github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8 h1:zLV6q4e8Jv9 github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161/go.mod h1:wM7WEvslTq+iOEAMDLSzhVuOt5BRZ05WirO+b09GHQU= github.com/templexxx/xor v0.0.0-20191217153810-f85b25db303b/go.mod h1:5XA7W9S6mni3h5uvOC75dA3m9CCCaS83lltmc0ukdi4= +github.com/tj/assert v0.0.0-20171129193455-018094318fb0 h1:Rw8kxzWo1mr6FSaYXjQELRe88y2KdfynXdnK72rdjtA= 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= @@ -541,18 +515,15 @@ go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -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= go.uber.org/atomic v1.5.0 h1:OI5t8sDa1Or+q8AeE+yKeB/SDYioSHAgcVljj9JIETY= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -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= go.uber.org/multierr v1.3.0 h1:sFPn2GLc3poCkfrpIXGhBD2X0CMIo4Q/zSULXrj/+uc= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= -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= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0 h1:nR6NoDBgAf67s68NhaXbsojM+2gxp3S1hWkHDl27pVU= @@ -560,7 +531,6 @@ go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/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= golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -572,7 +542,6 @@ golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191219195013-becbf705a915/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d h1:1ZiEyfaQIg3Qh0EoqpwAakHVhecoE5wlSg5GjnafJGw= golang.org/x/crypto v0.0.0-20200221231518-2aa609cf4a9d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37 h1:cg5LA/zNPRzIXIWSCxQW10Rvpy94aQh3LT/ShoCpkHw= golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -607,15 +576,14 @@ golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200513185701-a91f0712d120 h1:EZ3cVSzKOlJxAd8e8YAJ7no8nNypTxexh/YE/xW3ZEY= -golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200528225125-3c3fba18258b h1:IYiJPiJfzktmDAO1HQiwjMjwjlYKHAL7KzeD544RJPs= +golang.org/x/net v0.0.0-20200528225125-3c3fba18258b/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 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= golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 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= @@ -645,14 +613,11 @@ golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191224085550-c709ea063b76/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200219091948-cb0a6d8edb6c h1:jceGD5YNJGgGMkJz79agzOln1K9TaZUjv5ird16qniQ= golang.org/x/sys v0.0.0-20200219091948-cb0a6d8edb6c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae h1:/WDfKMnPU+m5M4xB+6x4kaepxRw6jWvR5iDRdvjHgy8= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200513112337-417ce2331b5c h1:kISX68E8gSkNYAFRFiDU8rl5RIn1sJYKYb/r2vMLDrU= -golang.org/x/sys v0.0.0-20200513112337-417ce2331b5c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200523222454-059865788121 h1:rITEj+UZHYC927n8GT97eC3zrpzXdb/voyeOuVKS46o= +golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= @@ -708,7 +673,6 @@ gopkg.in/AlecAivazis/survey.v1 v1.8.8/go.mod h1:CaHjv79TCgAvXMSFJSVgonHXYWxnhzI3 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/bsm/ratelimit.v1 v1.0.0-20160220154919-db14e161995a/go.mod h1:KF9sEfUPAXdG8Oev9e99iLGnl2uJMjc5B+4y3O7x610= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -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= 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= @@ -733,10 +697,8 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWD gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.5 h1:ymVxjfMaHvXD8RqPRmzHHsB3VvucivSkIAvJFDI5O3c= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -747,5 +709,5 @@ honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXe honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= -upper.io/db.v3 v3.6.4+incompatible h1:ZWpoGpfyvRDxMW1lYLBwwSurzodIvAUP4aYBsH/ePiY= -upper.io/db.v3 v3.6.4+incompatible/go.mod h1:FgTdD24eBjJAbPKsQSiHUNgXjOR4Lub3u1UMHSIh82Y= +upper.io/db.v3 v3.7.1+incompatible h1:GiK/NmDUClH3LrZd54qj5OQsz8brGFv652QXyRXtg2U= +upper.io/db.v3 v3.7.1+incompatible/go.mod h1:FgTdD24eBjJAbPKsQSiHUNgXjOR4Lub3u1UMHSIh82Y= diff --git a/internal/cli/geoip/geoip.go b/internal/cli/geoip/geoip.go index 191675b..db6772e 100644 --- a/internal/cli/geoip/geoip.go +++ b/internal/cli/geoip/geoip.go @@ -17,17 +17,23 @@ func init() { return err } - err = ctx.MaybeLocationLookup() + sess, err := ctx.NewSession() + if err != nil { + return err + } + defer sess.Close() + + err = sess.MaybeLookupLocation() if err != nil { return err } log.WithFields(log.Fields{ "type": "table", - "asn": ctx.Session.ProbeASNString(), - "network_name": ctx.Session.ProbeNetworkName(), - "country_code": ctx.Session.ProbeCC(), - "ip": ctx.Session.ProbeIP(), + "asn": sess.ProbeASNString(), + "network_name": sess.ProbeNetworkName(), + "country_code": sess.ProbeCC(), + "ip": sess.ProbeIP(), }).Info("Looked up your location") return nil diff --git a/internal/cli/run/run.go b/internal/cli/run/run.go index 0701283..c1f3892 100644 --- a/internal/cli/run/run.go +++ b/internal/cli/run/run.go @@ -19,6 +19,28 @@ func runNettestGroup(tg string, ctx *ooni.Context, network *database.Network) er return nil } + sess, err := ctx.NewSession() + if err != nil { + log.WithError(err).Error("Failed to create a measurement session") + return err + } + defer sess.Close() + + err = sess.MaybeLookupLocation() + if err != nil { + log.WithError(err).Error("Failed to lookup the location of the probe") + return err + } + network, err = database.CreateNetwork(ctx.DB, sess) + if err != nil { + log.WithError(err).Error("Failed to create the network row") + return err + } + if err := sess.MaybeLookupBackends(); err != nil { + log.WithError(err).Warn("Failed to discover OONI backends") + return err + } + group, ok := nettests.NettestGroups[tg] if !ok { log.Errorf("No test group named %s", tg) @@ -40,7 +62,7 @@ func runNettestGroup(tg string, ctx *ooni.Context, network *database.Network) er break } log.Debugf("Running test %T", nt) - ctl := nettests.NewController(nt, ctx, result) + ctl := nettests.NewController(nt, ctx, result, sess) ctl.SetNettestIndex(i, len(group.Nettests)) if err = nt.Run(ctl); err != nil { log.WithError(err).Errorf("Failed to run %s", group.Label) @@ -65,8 +87,6 @@ func init() { } noCollector := cmd.Flag("no-collector", "Disable uploading measurements to a collector").Bool() - collectorURL := cmd.Flag("collector-url", "Specify the address of a custom collector").String() - bouncerURL := cmd.Flag("bouncer-url", "Specify the address of a custom bouncer").String() cmd.Action(func(_ *kingpin.ParseContext) error { var err error @@ -84,40 +104,6 @@ func init() { if *noCollector == true { ctx.Config.Sharing.UploadResults = false } - if *collectorURL != "" { - ctx.Config.Advanced.CollectorURL = *collectorURL - } - if *bouncerURL != "" { - ctx.Config.Advanced.BouncerURL = *bouncerURL - } - log.Debugf("Using collector: %s", ctx.Config.Advanced.CollectorURL) - log.Debugf("Using bouncer: %s", ctx.Config.Advanced.CollectorURL) - - err = ctx.MaybeLocationLookup() - if err != nil { - log.WithError(err).Error("Failed to lookup the location of the probe") - return err - } - network, err = database.CreateNetwork(ctx.DB, ctx.Session) - if err != nil { - log.WithError(err).Error("Failed to create the network row") - return err - } - if ctx.Config.Advanced.BouncerURL != "" { - ctx.Session.AddAvailableHTTPSBouncer(ctx.Config.Advanced.BouncerURL) - } - if ctx.Config.Sharing.UploadResults && ctx.Config.Advanced.CollectorURL != "" { - ctx.Session.AddAvailableHTTPSCollector(ctx.Config.Advanced.CollectorURL) - } - if err := ctx.Session.MaybeLookupBackends(); err != nil { - log.WithError(err).Warn("Failed to discover OONI backends") - return err - } - // Make sure we share what the user wants us to share. - ctx.Session.SetIncludeProbeIP(ctx.Config.Sharing.IncludeIP) - ctx.Session.SetIncludeProbeASN(ctx.Config.Sharing.IncludeASN) - // Always include probe_cc - ctx.Session.SetIncludeProbeCC(true) return nil }) diff --git a/nettests/dash.go b/nettests/dash.go index 9c6a81e..ef7eef4 100644 --- a/nettests/dash.go +++ b/nettests/dash.go @@ -10,7 +10,7 @@ type Dash struct { // Run starts the test func (d Dash) Run(ctl *Controller) error { - builder, err := ctl.Ctx.Session.NewExperimentBuilder("dash") + builder, err := ctl.Session.NewExperimentBuilder("dash") if err != nil { return err } diff --git a/nettests/facebook_messenger.go b/nettests/facebook_messenger.go index 7e8067c..7ec7880 100644 --- a/nettests/facebook_messenger.go +++ b/nettests/facebook_messenger.go @@ -6,7 +6,7 @@ type FacebookMessenger struct { // Run starts the test func (h FacebookMessenger) Run(ctl *Controller) error { - builder, err := ctl.Ctx.Session.NewExperimentBuilder( + builder, err := ctl.Session.NewExperimentBuilder( "facebook_messenger", ) if err != nil { diff --git a/nettests/groups.go b/nettests/groups.go index 6446739..640c8ed 100644 --- a/nettests/groups.go +++ b/nettests/groups.go @@ -8,27 +8,27 @@ type NettestGroup struct { // NettestGroups that can be run by the user var NettestGroups = map[string]NettestGroup{ - "websites": NettestGroup{ + "websites": { Label: "Websites", Nettests: []Nettest{ WebConnectivity{}, }, }, - "performance": NettestGroup{ + "performance": { Label: "Performance", Nettests: []Nettest{ Dash{}, NDT{}, }, }, - "middlebox": NettestGroup{ + "middlebox": { Label: "Middleboxes", Nettests: []Nettest{ HTTPInvalidRequestLine{}, HTTPHeaderFieldManipulation{}, }, }, - "im": NettestGroup{ + "im": { Label: "Instant Messaging", Nettests: []Nettest{ FacebookMessenger{}, @@ -36,7 +36,7 @@ var NettestGroups = map[string]NettestGroup{ WhatsApp{}, }, }, - "circumvention": NettestGroup{ + "circumvention": { Label: "Circumvention Tools", Nettests: []Nettest{ Psiphon{}, diff --git a/nettests/http_header_field_manipulation.go b/nettests/http_header_field_manipulation.go index f9d20bc..6aada04 100644 --- a/nettests/http_header_field_manipulation.go +++ b/nettests/http_header_field_manipulation.go @@ -10,7 +10,7 @@ type HTTPHeaderFieldManipulation struct { // Run starts the test func (h HTTPHeaderFieldManipulation) Run(ctl *Controller) error { - builder, err := ctl.Ctx.Session.NewExperimentBuilder( + builder, err := ctl.Session.NewExperimentBuilder( "http_header_field_manipulation", ) if err != nil { diff --git a/nettests/http_invalid_request_line.go b/nettests/http_invalid_request_line.go index 4dcff14..dcaf95a 100644 --- a/nettests/http_invalid_request_line.go +++ b/nettests/http_invalid_request_line.go @@ -10,7 +10,7 @@ type HTTPInvalidRequestLine struct { // Run starts the test func (h HTTPInvalidRequestLine) Run(ctl *Controller) error { - builder, err := ctl.Ctx.Session.NewExperimentBuilder( + builder, err := ctl.Session.NewExperimentBuilder( "http_invalid_request_line", ) if err != nil { diff --git a/nettests/ndt.go b/nettests/ndt.go index d4fa70d..7555537 100644 --- a/nettests/ndt.go +++ b/nettests/ndt.go @@ -11,7 +11,7 @@ type NDT struct { // Run starts the test func (n NDT) Run(ctl *Controller) error { // Since 2020-03-18 probe-engine exports v7 as "ndt". - builder, err := ctl.Ctx.Session.NewExperimentBuilder("ndt") + builder, err := ctl.Session.NewExperimentBuilder("ndt") if err != nil { return err } diff --git a/nettests/nettests.go b/nettests/nettests.go index 2231546..fdd7dee 100644 --- a/nettests/nettests.go +++ b/nettests/nettests.go @@ -23,11 +23,13 @@ type Nettest interface { } // NewController creates a nettest controller -func NewController(nt Nettest, ctx *ooni.Context, res *database.Result) *Controller { +func NewController( + nt Nettest, ctx *ooni.Context, res *database.Result, sess *engine.Session) *Controller { return &Controller{ - Ctx: ctx, - nt: nt, - res: res, + Ctx: ctx, + nt: nt, + res: res, + Session: sess, } } @@ -35,6 +37,7 @@ func NewController(nt Nettest, ctx *ooni.Context, res *database.Result) *Control // each nettest instance has one controller type Controller struct { Ctx *ooni.Context + Session *engine.Session res *database.Result nt Nettest ntCount int diff --git a/nettests/nettests_test.go b/nettests/nettests_test.go index d74a1cf..4203282 100644 --- a/nettests/nettests_test.go +++ b/nettests/nettests_test.go @@ -34,7 +34,11 @@ func TestCreateContext(t *testing.T) { func TestRun(t *testing.T) { ctx := newTestingContext(t) - network, err := database.CreateNetwork(ctx.DB, ctx.Session) + sess, err := ctx.NewSession() + if err != nil { + t.Fatal(err) + } + network, err := database.CreateNetwork(ctx.DB, sess) if err != nil { t.Fatal(err) } @@ -43,6 +47,6 @@ func TestRun(t *testing.T) { t.Fatal(err) } nt := HTTPInvalidRequestLine{} - ctl := NewController(nt, ctx, res) + ctl := NewController(nt, ctx, res, sess) nt.Run(ctl) } diff --git a/nettests/psiphon.go b/nettests/psiphon.go index fef9fe9..f96f59e 100644 --- a/nettests/psiphon.go +++ b/nettests/psiphon.go @@ -8,7 +8,7 @@ type Psiphon struct { // Run starts the test func (h Psiphon) Run(ctl *Controller) error { - builder, err := ctl.Ctx.Session.NewExperimentBuilder( + builder, err := ctl.Session.NewExperimentBuilder( "psiphon", ) if err != nil { diff --git a/nettests/telegram.go b/nettests/telegram.go index 191516f..2ea68dd 100644 --- a/nettests/telegram.go +++ b/nettests/telegram.go @@ -6,7 +6,7 @@ type Telegram struct { // Run starts the test func (h Telegram) Run(ctl *Controller) error { - builder, err := ctl.Ctx.Session.NewExperimentBuilder( + builder, err := ctl.Session.NewExperimentBuilder( "telegram", ) if err != nil { diff --git a/nettests/tor.go b/nettests/tor.go index 872a679..7540c14 100644 --- a/nettests/tor.go +++ b/nettests/tor.go @@ -6,7 +6,7 @@ type Tor struct { // Run starts the test func (h Tor) Run(ctl *Controller) error { - builder, err := ctl.Ctx.Session.NewExperimentBuilder( + builder, err := ctl.Session.NewExperimentBuilder( "tor", ) if err != nil { diff --git a/nettests/web_connectivity.go b/nettests/web_connectivity.go index f16b2fc..ae8899c 100644 --- a/nettests/web_connectivity.go +++ b/nettests/web_connectivity.go @@ -9,7 +9,7 @@ import ( func lookupURLs(ctl *Controller, limit int64, categories []string) ([]string, map[int64]int64, error) { var urls []string urlIDMap := make(map[int64]int64) - testlist, err := ctl.Ctx.Session.QueryTestListsURLs(&engine.TestListsURLsConfig{ + testlist, err := ctl.Session.QueryTestListsURLs(&engine.TestListsURLsConfig{ Limit: limit, Categories: categories, }) @@ -44,7 +44,7 @@ func (n WebConnectivity) Run(ctl *Controller) error { return err } ctl.SetInputIdxMap(urlIDMap) - builder, err := ctl.Ctx.Session.NewExperimentBuilder( + builder, err := ctl.Session.NewExperimentBuilder( "web_connectivity", ) if err != nil { diff --git a/nettests/whatsapp.go b/nettests/whatsapp.go index 57a1aca..d05002b 100644 --- a/nettests/whatsapp.go +++ b/nettests/whatsapp.go @@ -6,7 +6,7 @@ type WhatsApp struct { // Run starts the test func (h WhatsApp) Run(ctl *Controller) error { - builder, err := ctl.Ctx.Session.NewExperimentBuilder( + builder, err := ctl.Session.NewExperimentBuilder( "whatsapp", ) if err != nil { diff --git a/ooni.go b/ooni.go index 2c9b4fb..b64f986 100644 --- a/ooni.go +++ b/ooni.go @@ -14,6 +14,7 @@ import ( "github.com/ooni/probe-cli/internal/enginex" "github.com/ooni/probe-cli/utils" engine "github.com/ooni/probe-engine" + "github.com/ooni/probe-engine/model" "github.com/pkg/errors" "upper.io/db.v3/lib/sqlbuilder" ) @@ -23,7 +24,6 @@ type Context struct { Config *config.Config DB sqlbuilder.Database IsBatch bool - Session *engine.Session Home string TempDir string @@ -36,11 +36,9 @@ type Context struct { // a 64 bit integer here because that may lead to crashes with 32 bit // OSes as documented in https://golang.org/pkg/sync/atomic/#pkg-note-BUG. isTerminatedAtomicInt int32 -} -// MaybeLocationLookup will lookup the location of the user unless it's already cached -func (c *Context) MaybeLocationLookup() error { - return c.Session.MaybeLookupLocation() + softwareName string + softwareVersion string } // IsTerminated checks to see if the isTerminatedAtomicInt is set to a non zero @@ -136,29 +134,34 @@ func (c *Context) Init(softwareName, softwareVersion string) error { } c.TempDir = tempDir + c.softwareName = softwareName + c.softwareVersion = softwareVersion + return nil +} + +// NewSession creates a new ooni/probe-engine session using the +// current configuration inside the context. The caller must close +// the session when done using it, by calling sess.Close(). +func (c *Context) NewSession() (*engine.Session, error) { kvstore, err := engine.NewFileSystemKVStore( utils.EngineDir(c.Home), ) if err != nil { - return errors.Wrap(err, "creating engine's kvstore") + return nil, errors.Wrap(err, "creating engine's kvstore") } - - // There is basically just a single engine.Session therefore we don't - // bother for now with adding support for closing the session. - sess, err := engine.NewSession(engine.SessionConfig{ - KVStore: kvstore, - Logger: enginex.Logger, - SoftwareName: softwareName, - SoftwareVersion: softwareVersion, - AssetsDir: utils.AssetsDir(c.Home), + return engine.NewSession(engine.SessionConfig{ + AssetsDir: utils.AssetsDir(c.Home), + KVStore: kvstore, + Logger: enginex.Logger, + PrivacySettings: model.PrivacySettings{ + IncludeASN: c.Config.Sharing.IncludeASN, + IncludeCountry: true, + IncludeIP: c.Config.Sharing.IncludeIP, + }, + SoftwareName: c.softwareName, + SoftwareVersion: c.softwareVersion, TempDir: c.TempDir, }) - if err != nil { - return err - } - c.Session = sess - - return nil } // NewContext creates a new context instance.