2021-02-02 12:05:47 +01:00
|
|
|
package engine
|
|
|
|
|
|
|
|
import (
|
|
|
|
"context"
|
|
|
|
"errors"
|
2021-06-15 14:01:45 +02:00
|
|
|
"io"
|
2021-02-02 12:05:47 +01:00
|
|
|
"net/http"
|
|
|
|
"net/http/httptest"
|
|
|
|
"net/url"
|
|
|
|
"os"
|
|
|
|
"syscall"
|
|
|
|
"testing"
|
|
|
|
|
|
|
|
"github.com/apex/log"
|
|
|
|
"github.com/google/go-cmp/cmp"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/probeservices"
|
2022-01-03 13:53:23 +01:00
|
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
2021-09-28 12:42:01 +02:00
|
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite"
|
2021-02-04 11:00:27 +01:00
|
|
|
"github.com/ooni/probe-cli/v3/internal/version"
|
2021-02-02 12:05:47 +01:00
|
|
|
)
|
|
|
|
|
feat(session): expose CheckIn method (#266)
* feat(session): expose CheckIn method
It seems to me the right thing to do is to query the CheckIn API
from the Session rather than querying it from InputLoader.
Then, InputLoader could just take a reference to a Session-like
interface that allows this functionality.
So, this diff exposes the Session.CheckIn method.
Doing that, in turn, required some refactoring to allow for
more and better unit tests.
While doing that, I also noticed that Session required a mutex
to be a well-behaving type, so I did that.
While doing that, I also tried to cover all the lines in session.go
and, as part of that, I have removed unused code.
Reference issue: https://github.com/ooni/probe/issues/1299.
* fix: reinstate comment I shan't have removed
* fix: repair broken test
* fix: a bit more coverage, annotations, etc.
* Update internal/engine/session.go
* Update internal/engine/session_integration_test.go
* Update internal/engine/session_internal_test.go
2021-03-29 15:04:41 +02:00
|
|
|
func TestSessionByteCounter(t *testing.T) {
|
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("skip test in short mode")
|
|
|
|
}
|
|
|
|
s := newSessionForTesting(t)
|
|
|
|
client := s.DefaultHTTPClient()
|
2022-07-08 11:08:10 +02:00
|
|
|
req, err := http.NewRequest("GET", "https://www.google.com", nil)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
resp, err := client.Do(req)
|
feat(session): expose CheckIn method (#266)
* feat(session): expose CheckIn method
It seems to me the right thing to do is to query the CheckIn API
from the Session rather than querying it from InputLoader.
Then, InputLoader could just take a reference to a Session-like
interface that allows this functionality.
So, this diff exposes the Session.CheckIn method.
Doing that, in turn, required some refactoring to allow for
more and better unit tests.
While doing that, I also noticed that Session required a mutex
to be a well-behaving type, so I did that.
While doing that, I also tried to cover all the lines in session.go
and, as part of that, I have removed unused code.
Reference issue: https://github.com/ooni/probe/issues/1299.
* fix: reinstate comment I shan't have removed
* fix: repair broken test
* fix: a bit more coverage, annotations, etc.
* Update internal/engine/session.go
* Update internal/engine/session_integration_test.go
* Update internal/engine/session_internal_test.go
2021-03-29 15:04:41 +02:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
defer resp.Body.Close()
|
2021-06-15 13:44:28 +02:00
|
|
|
ctx := context.Background()
|
2021-09-28 12:42:01 +02:00
|
|
|
if _, err := netxlite.CopyContext(ctx, io.Discard, resp.Body); err != nil {
|
feat(session): expose CheckIn method (#266)
* feat(session): expose CheckIn method
It seems to me the right thing to do is to query the CheckIn API
from the Session rather than querying it from InputLoader.
Then, InputLoader could just take a reference to a Session-like
interface that allows this functionality.
So, this diff exposes the Session.CheckIn method.
Doing that, in turn, required some refactoring to allow for
more and better unit tests.
While doing that, I also noticed that Session required a mutex
to be a well-behaving type, so I did that.
While doing that, I also tried to cover all the lines in session.go
and, as part of that, I have removed unused code.
Reference issue: https://github.com/ooni/probe/issues/1299.
* fix: reinstate comment I shan't have removed
* fix: repair broken test
* fix: a bit more coverage, annotations, etc.
* Update internal/engine/session.go
* Update internal/engine/session_integration_test.go
* Update internal/engine/session_internal_test.go
2021-03-29 15:04:41 +02:00
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if s.KibiBytesSent() <= 0 || s.KibiBytesReceived() <= 0 {
|
|
|
|
t.Fatal("byte counter is not working")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-02-02 12:05:47 +01:00
|
|
|
func TestNewSessionBuilderChecks(t *testing.T) {
|
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("skip test in short mode")
|
|
|
|
}
|
|
|
|
t.Run("with no settings", func(t *testing.T) {
|
|
|
|
newSessionMustFail(t, SessionConfig{})
|
|
|
|
})
|
|
|
|
t.Run("with also logger", func(t *testing.T) {
|
|
|
|
newSessionMustFail(t, SessionConfig{
|
2021-04-01 16:57:31 +02:00
|
|
|
Logger: model.DiscardLogger,
|
2021-02-02 12:05:47 +01:00
|
|
|
})
|
|
|
|
})
|
|
|
|
t.Run("with also software name", func(t *testing.T) {
|
|
|
|
newSessionMustFail(t, SessionConfig{
|
|
|
|
Logger: model.DiscardLogger,
|
|
|
|
SoftwareName: "ooniprobe-engine",
|
|
|
|
})
|
|
|
|
})
|
|
|
|
t.Run("with software version and wrong tempdir", func(t *testing.T) {
|
|
|
|
newSessionMustFail(t, SessionConfig{
|
|
|
|
Logger: model.DiscardLogger,
|
|
|
|
SoftwareName: "ooniprobe-engine",
|
|
|
|
SoftwareVersion: "0.0.1",
|
|
|
|
TempDir: "./nonexistent",
|
|
|
|
})
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestNewSessionBuilderGood(t *testing.T) {
|
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("skip test in short mode")
|
|
|
|
}
|
|
|
|
newSessionForTesting(t)
|
|
|
|
}
|
|
|
|
|
|
|
|
func newSessionMustFail(t *testing.T, config SessionConfig) {
|
2021-04-05 15:28:13 +02:00
|
|
|
sess, err := NewSession(context.Background(), config)
|
2021-02-02 12:05:47 +01:00
|
|
|
if err == nil {
|
|
|
|
t.Fatal("expected an error here")
|
|
|
|
}
|
|
|
|
if sess != nil {
|
|
|
|
t.Fatal("expected nil session here")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestSessionTorArgsTorBinary(t *testing.T) {
|
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("skip test in short mode")
|
|
|
|
}
|
2021-04-05 15:28:13 +02:00
|
|
|
sess, err := NewSession(context.Background(), SessionConfig{
|
2022-01-03 13:53:23 +01:00
|
|
|
AvailableProbeServices: []model.OOAPIService{{
|
2021-02-02 12:05:47 +01:00
|
|
|
Address: "https://ams-pg-test.ooni.org",
|
|
|
|
Type: "https",
|
|
|
|
}},
|
|
|
|
Logger: model.DiscardLogger,
|
|
|
|
SoftwareName: "ooniprobe-engine",
|
|
|
|
SoftwareVersion: "0.0.1",
|
|
|
|
TorArgs: []string{"antani1", "antani2", "antani3"},
|
|
|
|
TorBinary: "mascetti",
|
|
|
|
})
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if sess.TorBinary() != "mascetti" {
|
|
|
|
t.Fatal("not the TorBinary we expected")
|
|
|
|
}
|
|
|
|
if len(sess.TorArgs()) != 3 {
|
|
|
|
t.Fatal("not the TorArgs length we expected")
|
|
|
|
}
|
|
|
|
if sess.TorArgs()[0] != "antani1" {
|
|
|
|
t.Fatal("not the TorArgs[0] we expected")
|
|
|
|
}
|
|
|
|
if sess.TorArgs()[1] != "antani2" {
|
|
|
|
t.Fatal("not the TorArgs[1] we expected")
|
|
|
|
}
|
|
|
|
if sess.TorArgs()[2] != "antani3" {
|
|
|
|
t.Fatal("not the TorArgs[2] we expected")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func newSessionForTestingNoLookupsWithProxyURL(t *testing.T, URL *url.URL) *Session {
|
2021-04-05 15:28:13 +02:00
|
|
|
sess, err := NewSession(context.Background(), SessionConfig{
|
2022-01-03 13:53:23 +01:00
|
|
|
AvailableProbeServices: []model.OOAPIService{{
|
2021-02-02 12:05:47 +01:00
|
|
|
Address: "https://ams-pg-test.ooni.org",
|
|
|
|
Type: "https",
|
|
|
|
}},
|
|
|
|
Logger: model.DiscardLogger,
|
|
|
|
ProxyURL: URL,
|
|
|
|
SoftwareName: "ooniprobe-engine",
|
|
|
|
SoftwareVersion: "0.0.1",
|
|
|
|
})
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
return sess
|
|
|
|
}
|
|
|
|
|
|
|
|
func newSessionForTestingNoLookups(t *testing.T) *Session {
|
|
|
|
return newSessionForTestingNoLookupsWithProxyURL(t, nil)
|
|
|
|
}
|
|
|
|
|
|
|
|
func newSessionForTestingNoBackendsLookup(t *testing.T) *Session {
|
|
|
|
sess := newSessionForTestingNoLookups(t)
|
|
|
|
if err := sess.MaybeLookupLocation(); err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
log.Infof("Platform: %s", sess.Platform())
|
|
|
|
log.Infof("ProbeASN: %d", sess.ProbeASN())
|
|
|
|
log.Infof("ProbeASNString: %s", sess.ProbeASNString())
|
|
|
|
log.Infof("ProbeCC: %s", sess.ProbeCC())
|
|
|
|
log.Infof("ProbeIP: %s", sess.ProbeIP())
|
|
|
|
log.Infof("ProbeNetworkName: %s", sess.ProbeNetworkName())
|
|
|
|
log.Infof("ResolverASN: %d", sess.ResolverASN())
|
|
|
|
log.Infof("ResolverASNString: %s", sess.ResolverASNString())
|
|
|
|
log.Infof("ResolverIP: %s", sess.ResolverIP())
|
|
|
|
log.Infof("ResolverNetworkName: %s", sess.ResolverNetworkName())
|
|
|
|
return sess
|
|
|
|
}
|
|
|
|
|
|
|
|
func newSessionForTesting(t *testing.T) *Session {
|
|
|
|
sess := newSessionForTestingNoBackendsLookup(t)
|
|
|
|
if err := sess.MaybeLookupBackends(); err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
return sess
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestInitOrchestraClientMaybeRegisterError(t *testing.T) {
|
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("skip test in short mode")
|
|
|
|
}
|
|
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
|
|
cancel() // so we fail immediately
|
|
|
|
sess := newSessionForTestingNoLookups(t)
|
|
|
|
defer sess.Close()
|
2022-01-03 13:53:23 +01:00
|
|
|
clnt, err := probeservices.NewClient(sess, model.OOAPIService{
|
2021-02-02 12:05:47 +01:00
|
|
|
Address: "https://ams-pg-test.ooni.org/",
|
|
|
|
Type: "https",
|
|
|
|
})
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
outclnt, err := sess.initOrchestraClient(
|
|
|
|
ctx, clnt, clnt.MaybeLogin,
|
|
|
|
)
|
|
|
|
if !errors.Is(err, context.Canceled) {
|
|
|
|
t.Fatal("not the error we expected")
|
|
|
|
}
|
|
|
|
if outclnt != nil {
|
|
|
|
t.Fatal("expected a nil client here")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestInitOrchestraClientMaybeLoginError(t *testing.T) {
|
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("skip test in short mode")
|
|
|
|
}
|
|
|
|
ctx := context.Background()
|
|
|
|
sess := newSessionForTestingNoLookups(t)
|
|
|
|
defer sess.Close()
|
2022-01-03 13:53:23 +01:00
|
|
|
clnt, err := probeservices.NewClient(sess, model.OOAPIService{
|
2021-02-02 12:05:47 +01:00
|
|
|
Address: "https://ams-pg-test.ooni.org/",
|
|
|
|
Type: "https",
|
|
|
|
})
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
expected := errors.New("mocked error")
|
|
|
|
outclnt, err := sess.initOrchestraClient(
|
|
|
|
ctx, clnt, func(context.Context) error {
|
|
|
|
return expected
|
|
|
|
},
|
|
|
|
)
|
|
|
|
if !errors.Is(err, expected) {
|
|
|
|
t.Fatal("not the error we expected")
|
|
|
|
}
|
|
|
|
if outclnt != nil {
|
|
|
|
t.Fatal("expected a nil client here")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestBouncerError(t *testing.T) {
|
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("skip test in short mode")
|
|
|
|
}
|
|
|
|
// Combine proxy testing with a broken proxy with errors
|
|
|
|
// in reaching out to the bouncer.
|
|
|
|
server := httptest.NewServer(http.HandlerFunc(
|
|
|
|
func(w http.ResponseWriter, r *http.Request) {
|
|
|
|
w.WriteHeader(500)
|
|
|
|
},
|
|
|
|
))
|
|
|
|
defer server.Close()
|
|
|
|
URL, err := url.Parse(server.URL)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
sess := newSessionForTestingNoLookupsWithProxyURL(t, URL)
|
|
|
|
defer sess.Close()
|
|
|
|
if sess.ProxyURL() == nil {
|
|
|
|
t.Fatal("expected to see explicit proxy here")
|
|
|
|
}
|
|
|
|
if err := sess.MaybeLookupBackends(); err == nil {
|
|
|
|
t.Fatal("expected an error here")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestMaybeLookupBackendsNewClientError(t *testing.T) {
|
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("skip test in short mode")
|
|
|
|
}
|
|
|
|
sess := newSessionForTestingNoLookups(t)
|
2022-01-03 13:53:23 +01:00
|
|
|
sess.availableProbeServices = []model.OOAPIService{{
|
2021-02-02 12:05:47 +01:00
|
|
|
Type: "onion",
|
|
|
|
Address: "httpo://jehhrikjjqrlpufu.onion",
|
|
|
|
}}
|
|
|
|
defer sess.Close()
|
|
|
|
err := sess.MaybeLookupBackends()
|
|
|
|
if !errors.Is(err, ErrAllProbeServicesFailed) {
|
|
|
|
t.Fatal("not the error we expected")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestSessionLocationLookup(t *testing.T) {
|
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("skip test in short mode")
|
|
|
|
}
|
|
|
|
sess := newSessionForTestingNoLookups(t)
|
|
|
|
defer sess.Close()
|
|
|
|
if err := sess.MaybeLookupLocation(); err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
2022-08-28 20:00:25 +02:00
|
|
|
if sess.ProbeASNString() == model.DefaultProbeASNString {
|
2021-02-02 12:05:47 +01:00
|
|
|
t.Fatal("unexpected ProbeASNString")
|
|
|
|
}
|
2022-08-28 20:00:25 +02:00
|
|
|
if sess.ProbeASN() == model.DefaultProbeASN {
|
2021-02-02 12:05:47 +01:00
|
|
|
t.Fatal("unexpected ProbeASN")
|
|
|
|
}
|
2022-08-28 20:00:25 +02:00
|
|
|
if sess.ProbeCC() == model.DefaultProbeCC {
|
2021-02-02 12:05:47 +01:00
|
|
|
t.Fatal("unexpected ProbeCC")
|
|
|
|
}
|
2022-08-28 20:00:25 +02:00
|
|
|
if sess.ProbeIP() == model.DefaultProbeIP {
|
2021-02-02 12:05:47 +01:00
|
|
|
t.Fatal("unexpected ProbeIP")
|
|
|
|
}
|
2022-08-28 20:00:25 +02:00
|
|
|
if sess.ProbeNetworkName() == model.DefaultProbeNetworkName {
|
2021-02-02 12:05:47 +01:00
|
|
|
t.Fatal("unexpected ProbeNetworkName")
|
|
|
|
}
|
2022-08-28 20:00:25 +02:00
|
|
|
if sess.ResolverASN() == model.DefaultResolverASN {
|
2021-02-02 12:05:47 +01:00
|
|
|
t.Fatal("unexpected ResolverASN")
|
|
|
|
}
|
2022-08-28 20:00:25 +02:00
|
|
|
if sess.ResolverASNString() == model.DefaultResolverASNString {
|
2021-02-02 12:05:47 +01:00
|
|
|
t.Fatal("unexpected ResolverASNString")
|
|
|
|
}
|
2022-08-28 20:00:25 +02:00
|
|
|
if sess.ResolverIP() == model.DefaultResolverIP {
|
2021-02-02 12:05:47 +01:00
|
|
|
t.Fatal("unexpected ResolverIP")
|
|
|
|
}
|
2022-08-28 20:00:25 +02:00
|
|
|
if sess.ResolverNetworkName() == model.DefaultResolverNetworkName {
|
2021-02-02 12:05:47 +01:00
|
|
|
t.Fatal("unexpected ResolverNetworkName")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
feat(session): expose CheckIn method (#266)
* feat(session): expose CheckIn method
It seems to me the right thing to do is to query the CheckIn API
from the Session rather than querying it from InputLoader.
Then, InputLoader could just take a reference to a Session-like
interface that allows this functionality.
So, this diff exposes the Session.CheckIn method.
Doing that, in turn, required some refactoring to allow for
more and better unit tests.
While doing that, I also noticed that Session required a mutex
to be a well-behaving type, so I did that.
While doing that, I also tried to cover all the lines in session.go
and, as part of that, I have removed unused code.
Reference issue: https://github.com/ooni/probe/issues/1299.
* fix: reinstate comment I shan't have removed
* fix: repair broken test
* fix: a bit more coverage, annotations, etc.
* Update internal/engine/session.go
* Update internal/engine/session_integration_test.go
* Update internal/engine/session_internal_test.go
2021-03-29 15:04:41 +02:00
|
|
|
func TestSessionCheckInWithRealAPI(t *testing.T) {
|
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("skip test in short mode")
|
|
|
|
}
|
|
|
|
sess := newSessionForTesting(t)
|
|
|
|
defer sess.Close()
|
2022-01-03 13:53:23 +01:00
|
|
|
results, err := sess.CheckIn(context.Background(), &model.OOAPICheckInConfig{})
|
feat(session): expose CheckIn method (#266)
* feat(session): expose CheckIn method
It seems to me the right thing to do is to query the CheckIn API
from the Session rather than querying it from InputLoader.
Then, InputLoader could just take a reference to a Session-like
interface that allows this functionality.
So, this diff exposes the Session.CheckIn method.
Doing that, in turn, required some refactoring to allow for
more and better unit tests.
While doing that, I also noticed that Session required a mutex
to be a well-behaving type, so I did that.
While doing that, I also tried to cover all the lines in session.go
and, as part of that, I have removed unused code.
Reference issue: https://github.com/ooni/probe/issues/1299.
* fix: reinstate comment I shan't have removed
* fix: repair broken test
* fix: a bit more coverage, annotations, etc.
* Update internal/engine/session.go
* Update internal/engine/session_integration_test.go
* Update internal/engine/session_internal_test.go
2021-03-29 15:04:41 +02:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if results == nil {
|
|
|
|
t.Fatal("expected non nil results here")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-02-02 12:05:47 +01:00
|
|
|
func TestSessionCloseCancelsTempDir(t *testing.T) {
|
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("skip test in short mode")
|
|
|
|
}
|
|
|
|
sess := newSessionForTestingNoLookups(t)
|
|
|
|
tempDir := sess.TempDir()
|
|
|
|
if _, err := os.Stat(tempDir); err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if err := sess.Close(); err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if _, err := os.Stat(tempDir); !errors.Is(err, syscall.ENOENT) {
|
|
|
|
t.Fatal("not the error we expected")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestGetAvailableProbeServices(t *testing.T) {
|
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("skip test in short mode")
|
|
|
|
}
|
2021-04-05 15:28:13 +02:00
|
|
|
sess, err := NewSession(context.Background(), SessionConfig{
|
2021-02-02 12:05:47 +01:00
|
|
|
Logger: model.DiscardLogger,
|
|
|
|
SoftwareName: "ooniprobe-engine",
|
|
|
|
SoftwareVersion: "0.0.1",
|
|
|
|
})
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
defer sess.Close()
|
|
|
|
all := sess.GetAvailableProbeServices()
|
|
|
|
diff := cmp.Diff(all, probeservices.Default())
|
|
|
|
if diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestMaybeLookupBackendsFailure(t *testing.T) {
|
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("skip test in short mode")
|
|
|
|
}
|
2021-04-05 15:28:13 +02:00
|
|
|
sess, err := NewSession(context.Background(), SessionConfig{
|
2021-02-02 12:05:47 +01:00
|
|
|
Logger: model.DiscardLogger,
|
|
|
|
SoftwareName: "ooniprobe-engine",
|
|
|
|
SoftwareVersion: "0.0.1",
|
|
|
|
})
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
defer sess.Close()
|
|
|
|
ctx, cancel := context.WithCancel(context.Background())
|
|
|
|
cancel() // so we fail immediately
|
|
|
|
err = sess.MaybeLookupBackendsContext(ctx)
|
|
|
|
if !errors.Is(err, ErrAllProbeServicesFailed) {
|
|
|
|
t.Fatal("unexpected error")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestMaybeLookupTestHelpersIdempotent(t *testing.T) {
|
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("skip test in short mode")
|
|
|
|
}
|
2021-04-05 15:28:13 +02:00
|
|
|
sess, err := NewSession(context.Background(), SessionConfig{
|
2021-02-02 12:05:47 +01:00
|
|
|
Logger: model.DiscardLogger,
|
|
|
|
SoftwareName: "ooniprobe-engine",
|
|
|
|
SoftwareVersion: "0.0.1",
|
|
|
|
})
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
defer sess.Close()
|
|
|
|
ctx := context.Background()
|
|
|
|
if err = sess.MaybeLookupBackendsContext(ctx); err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if err = sess.MaybeLookupBackendsContext(ctx); err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if sess.QueryProbeServicesCount() != 1 {
|
|
|
|
t.Fatal("unexpected number of queries sent to the bouncer")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestAllProbeServicesUnsupported(t *testing.T) {
|
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("skip test in short mode")
|
|
|
|
}
|
2021-04-05 15:28:13 +02:00
|
|
|
sess, err := NewSession(context.Background(), SessionConfig{
|
2021-02-02 12:05:47 +01:00
|
|
|
Logger: model.DiscardLogger,
|
|
|
|
SoftwareName: "ooniprobe-engine",
|
|
|
|
SoftwareVersion: "0.0.1",
|
|
|
|
})
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
defer sess.Close()
|
2022-01-03 13:53:23 +01:00
|
|
|
sess.AppendAvailableProbeService(model.OOAPIService{
|
2021-02-02 12:05:47 +01:00
|
|
|
Address: "mascetti",
|
|
|
|
Type: "antani",
|
|
|
|
})
|
|
|
|
err = sess.MaybeLookupBackends()
|
|
|
|
if !errors.Is(err, ErrAllProbeServicesFailed) {
|
|
|
|
t.Fatal("unexpected error")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestUserAgentNoProxy(t *testing.T) {
|
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("skip test in short mode")
|
|
|
|
}
|
|
|
|
expect := "ooniprobe-engine/0.0.1 ooniprobe-engine/" + version.Version
|
|
|
|
sess := newSessionForTestingNoLookups(t)
|
|
|
|
ua := sess.UserAgent()
|
|
|
|
diff := cmp.Diff(expect, ua)
|
|
|
|
if diff != "" {
|
|
|
|
t.Fatal(diff)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestNewOrchestraClientMaybeLookupBackendsFailure(t *testing.T) {
|
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("skip test in short mode")
|
|
|
|
}
|
feat(session): expose CheckIn method (#266)
* feat(session): expose CheckIn method
It seems to me the right thing to do is to query the CheckIn API
from the Session rather than querying it from InputLoader.
Then, InputLoader could just take a reference to a Session-like
interface that allows this functionality.
So, this diff exposes the Session.CheckIn method.
Doing that, in turn, required some refactoring to allow for
more and better unit tests.
While doing that, I also noticed that Session required a mutex
to be a well-behaving type, so I did that.
While doing that, I also tried to cover all the lines in session.go
and, as part of that, I have removed unused code.
Reference issue: https://github.com/ooni/probe/issues/1299.
* fix: reinstate comment I shan't have removed
* fix: repair broken test
* fix: a bit more coverage, annotations, etc.
* Update internal/engine/session.go
* Update internal/engine/session_integration_test.go
* Update internal/engine/session_internal_test.go
2021-03-29 15:04:41 +02:00
|
|
|
errMocked := errors.New("mocked error")
|
2021-02-02 12:05:47 +01:00
|
|
|
sess := newSessionForTestingNoLookups(t)
|
feat(session): expose CheckIn method (#266)
* feat(session): expose CheckIn method
It seems to me the right thing to do is to query the CheckIn API
from the Session rather than querying it from InputLoader.
Then, InputLoader could just take a reference to a Session-like
interface that allows this functionality.
So, this diff exposes the Session.CheckIn method.
Doing that, in turn, required some refactoring to allow for
more and better unit tests.
While doing that, I also noticed that Session required a mutex
to be a well-behaving type, so I did that.
While doing that, I also tried to cover all the lines in session.go
and, as part of that, I have removed unused code.
Reference issue: https://github.com/ooni/probe/issues/1299.
* fix: reinstate comment I shan't have removed
* fix: repair broken test
* fix: a bit more coverage, annotations, etc.
* Update internal/engine/session.go
* Update internal/engine/session_integration_test.go
* Update internal/engine/session_internal_test.go
2021-03-29 15:04:41 +02:00
|
|
|
sess.testMaybeLookupBackendsContext = func(ctx context.Context) error {
|
|
|
|
return errMocked
|
|
|
|
}
|
|
|
|
client, err := sess.NewOrchestraClient(context.Background())
|
|
|
|
if !errors.Is(err, errMocked) {
|
|
|
|
t.Fatal("not the error we expected", err)
|
2021-02-02 12:05:47 +01:00
|
|
|
}
|
|
|
|
if client != nil {
|
|
|
|
t.Fatal("expected nil client here")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestNewOrchestraClientMaybeLookupLocationFailure(t *testing.T) {
|
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("skip test in short mode")
|
|
|
|
}
|
feat(session): expose CheckIn method (#266)
* feat(session): expose CheckIn method
It seems to me the right thing to do is to query the CheckIn API
from the Session rather than querying it from InputLoader.
Then, InputLoader could just take a reference to a Session-like
interface that allows this functionality.
So, this diff exposes the Session.CheckIn method.
Doing that, in turn, required some refactoring to allow for
more and better unit tests.
While doing that, I also noticed that Session required a mutex
to be a well-behaving type, so I did that.
While doing that, I also tried to cover all the lines in session.go
and, as part of that, I have removed unused code.
Reference issue: https://github.com/ooni/probe/issues/1299.
* fix: reinstate comment I shan't have removed
* fix: repair broken test
* fix: a bit more coverage, annotations, etc.
* Update internal/engine/session.go
* Update internal/engine/session_integration_test.go
* Update internal/engine/session_internal_test.go
2021-03-29 15:04:41 +02:00
|
|
|
errMocked := errors.New("mocked error")
|
2021-02-02 12:05:47 +01:00
|
|
|
sess := newSessionForTestingNoLookups(t)
|
feat(session): expose CheckIn method (#266)
* feat(session): expose CheckIn method
It seems to me the right thing to do is to query the CheckIn API
from the Session rather than querying it from InputLoader.
Then, InputLoader could just take a reference to a Session-like
interface that allows this functionality.
So, this diff exposes the Session.CheckIn method.
Doing that, in turn, required some refactoring to allow for
more and better unit tests.
While doing that, I also noticed that Session required a mutex
to be a well-behaving type, so I did that.
While doing that, I also tried to cover all the lines in session.go
and, as part of that, I have removed unused code.
Reference issue: https://github.com/ooni/probe/issues/1299.
* fix: reinstate comment I shan't have removed
* fix: repair broken test
* fix: a bit more coverage, annotations, etc.
* Update internal/engine/session.go
* Update internal/engine/session_integration_test.go
* Update internal/engine/session_internal_test.go
2021-03-29 15:04:41 +02:00
|
|
|
sess.testMaybeLookupLocationContext = func(ctx context.Context) error {
|
|
|
|
return errMocked
|
|
|
|
}
|
|
|
|
client, err := sess.NewOrchestraClient(context.Background())
|
|
|
|
if !errors.Is(err, errMocked) {
|
2021-02-02 12:05:47 +01:00
|
|
|
t.Fatalf("not the error we expected: %+v", err)
|
|
|
|
}
|
|
|
|
if client != nil {
|
|
|
|
t.Fatal("expected nil client here")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestNewOrchestraClientProbeServicesNewClientFailure(t *testing.T) {
|
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("skip test in short mode")
|
|
|
|
}
|
|
|
|
sess := newSessionForTestingNoLookups(t)
|
2022-01-03 13:53:23 +01:00
|
|
|
sess.selectedProbeServiceHook = func(svc *model.OOAPIService) {
|
2021-02-02 12:05:47 +01:00
|
|
|
svc.Type = "antani" // should really not be supported for a long time
|
|
|
|
}
|
|
|
|
client, err := sess.NewOrchestraClient(context.Background())
|
|
|
|
if !errors.Is(err, probeservices.ErrUnsupportedEndpoint) {
|
|
|
|
t.Fatal("not the error we expected")
|
|
|
|
}
|
|
|
|
if client != nil {
|
|
|
|
t.Fatal("expected nil client here")
|
|
|
|
}
|
|
|
|
}
|
feat(session): expose CheckIn method (#266)
* feat(session): expose CheckIn method
It seems to me the right thing to do is to query the CheckIn API
from the Session rather than querying it from InputLoader.
Then, InputLoader could just take a reference to a Session-like
interface that allows this functionality.
So, this diff exposes the Session.CheckIn method.
Doing that, in turn, required some refactoring to allow for
more and better unit tests.
While doing that, I also noticed that Session required a mutex
to be a well-behaving type, so I did that.
While doing that, I also tried to cover all the lines in session.go
and, as part of that, I have removed unused code.
Reference issue: https://github.com/ooni/probe/issues/1299.
* fix: reinstate comment I shan't have removed
* fix: repair broken test
* fix: a bit more coverage, annotations, etc.
* Update internal/engine/session.go
* Update internal/engine/session_integration_test.go
* Update internal/engine/session_internal_test.go
2021-03-29 15:04:41 +02:00
|
|
|
|
|
|
|
func TestSessionNewSubmitterReturnsNonNilSubmitter(t *testing.T) {
|
|
|
|
sess := newSessionForTesting(t)
|
|
|
|
subm, err := sess.NewSubmitter(context.Background())
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if subm == nil {
|
|
|
|
t.Fatal("expected non nil submitter here")
|
|
|
|
}
|
|
|
|
}
|
2021-04-02 12:03:18 +02:00
|
|
|
|
|
|
|
func TestSessionFetchURLList(t *testing.T) {
|
|
|
|
if testing.Short() {
|
|
|
|
t.Skip("skip test in short mode")
|
|
|
|
}
|
|
|
|
sess := newSessionForTesting(t)
|
2022-01-03 13:53:23 +01:00
|
|
|
resp, err := sess.FetchURLList(context.Background(), model.OOAPIURLListConfig{})
|
2021-04-02 12:03:18 +02:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal(err)
|
|
|
|
}
|
|
|
|
if resp == nil {
|
|
|
|
t.Fatal("expected non-nil response here")
|
|
|
|
}
|
|
|
|
}
|