2021-02-02 12:05:47 +01:00
|
|
|
// Package mockable contains mockable objects
|
|
|
|
package mockable
|
|
|
|
|
|
|
|
import (
|
|
|
|
"context"
|
|
|
|
"net/url"
|
|
|
|
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/probeservices"
|
refactor: flatten and separate (#353)
* refactor(atomicx): move outside the engine package
After merging probe-engine into probe-cli, my impression is that we have
too much unnecessary nesting of packages in this repository.
The idea of this commit and of a bunch of following commits will instead
be to reduce the nesting and simplify the structure.
While there, improve the documentation.
* fix: always use the atomicx package
For consistency, never use sync/atomic and always use ./internal/atomicx
so we can just grep and make sure we're not risking to crash if we make
a subtle mistake on a 32 bit platform.
While there, mention in the contributing guidelines that we want to
always prefer the ./internal/atomicx package over sync/atomic.
* fix(atomicx): remove unnecessary constructor
We don't need a constructor here. The default constructed `&Int64{}`
instance is already usable and the constructor does not add anything to
what we are doing, rather it just creates extra confusion.
* cleanup(atomicx): we are not using Float64
Because atomicx.Float64 is unused, we can safely zap it.
* cleanup(atomicx): simplify impl and improve tests
We can simplify the implementation by using defer and by letting
the Load() method call Add(0).
We can improve tests by making many goroutines updated the
atomic int64 value concurrently.
* refactor(fsx): can live in the ./internal pkg
Let us reduce the amount of nesting. While there, ensure that the
package only exports the bare minimum, and improve the documentation
of the tests, to ease reading the code.
* refactor: move runtimex to ./internal
* refactor: move shellx into the ./internal package
While there, remove unnecessary dependency between packages.
While there, specify in the contributing guidelines that
one should use x/sys/execabs instead of os/exec.
* refactor: move ooapi into the ./internal pkg
* refactor(humanize): move to ./internal and better docs
* refactor: move platform to ./internal
* refactor(randx): move to ./internal
* refactor(multierror): move into the ./internal pkg
* refactor(kvstore): all kvstores in ./internal
Rather than having part of the kvstore inside ./internal/engine/kvstore
and part in ./internal/engine/kvstore.go, let us put every piece of code
that is kvstore related into the ./internal/kvstore package.
* fix(kvstore): always return ErrNoSuchKey on Get() error
It should help to use the kvstore everywhere removing all the
copies that are lingering around the tree.
* sessionresolver: make KVStore mandatory
Simplifies implementation. While there, use the ./internal/kvstore
package rather than having our private implementation.
* fix(ooapi): use the ./internal/kvstore package
* fix(platform): better documentation
2021-06-04 10:34:18 +02:00
|
|
|
"github.com/ooni/probe-cli/v3/internal/kvstore"
|
2022-01-03 13:53:23 +01:00
|
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
2021-02-02 12:05:47 +01:00
|
|
|
)
|
|
|
|
|
|
|
|
// Session allows to mock sessions.
|
|
|
|
type Session struct {
|
2022-01-03 13:53:23 +01:00
|
|
|
MockableTestHelpers map[string][]model.OOAPIService
|
2022-07-08 11:08:10 +02:00
|
|
|
MockableHTTPClient model.HTTPClient
|
2021-04-02 12:03:18 +02:00
|
|
|
MockableLogger model.Logger
|
|
|
|
MockableMaybeResolverIP string
|
|
|
|
MockableProbeASNString string
|
|
|
|
MockableProbeCC string
|
|
|
|
MockableProbeIP string
|
|
|
|
MockableProbeNetworkName string
|
|
|
|
MockableProxyURL *url.URL
|
|
|
|
MockableFetchPsiphonConfigResult []byte
|
|
|
|
MockableFetchPsiphonConfigErr error
|
2022-01-03 13:53:23 +01:00
|
|
|
MockableFetchTorTargetsResult map[string]model.OOAPITorTarget
|
2021-04-02 12:03:18 +02:00
|
|
|
MockableFetchTorTargetsErr error
|
2022-01-03 13:53:23 +01:00
|
|
|
MockableFetchURLListResult []model.OOAPIURLInfo
|
2021-04-02 12:03:18 +02:00
|
|
|
MockableFetchURLListErr error
|
|
|
|
MockableResolverIP string
|
|
|
|
MockableSoftwareName string
|
|
|
|
MockableSoftwareVersion string
|
|
|
|
MockableTempDir string
|
|
|
|
MockableTorArgs []string
|
|
|
|
MockableTorBinary string
|
feat(torsf): collect tor logs, select rendezvous method, count bytes (#683)
This diff contains significant improvements over the previous
implementation of the torsf experiment.
We add support for configuring different rendezvous methods after
the convo at https://github.com/ooni/probe/issues/2004. In doing
that, I've tried to use a terminology that is consistent with the
names being actually used by tor developers.
In terms of what to do next, this diff basically instruments
torsf to always rendezvous using domain fronting. Yet, it's also
possible to change the rendezvous method from the command line,
when using miniooni, which allows to experiment a bit more. In the
same vein, by default we use a persistent tor datadir, but it's
also possible to use a temporary datadir using the cmdline.
Here's how a generic invocation of `torsf` looks like:
```bash
./miniooni -O DisablePersistentDatadir=true \
-O RendezvousMethod=amp \
-O DisableProgress=true \
torsf
```
(The default is `DisablePersistentDatadir=false` and
`RendezvousMethod=domain_fronting`.)
With this implementation, we can start measuring whether snowflake
and tor together can boostrap, which seems the most important thing
to focus on at the beginning. Understanding why the bootstrap most
often does not converge with a temporary datadir on Android devices
remains instead an open problem for now. (I'll also update the
relevant issues or create new issues after commit this.)
We also address some methodology improvements that were proposed
in https://github.com/ooni/probe/issues/1686. Namely:
1. we record the tor version;
2. we include the bootstrap percentage by reading the logs;
3. we set the anomaly key correctly;
4. we measure the bytes send and received (by `tor` not by `snowflake`, since
doing it for snowflake seems more complex at this stage).
What remains to be done is the possibility of including Snowflake
events into the measurement, which is not possible until the new
improvements at common/event in snowflake.git are included into a
tagged version of snowflake itself. (I'll make sure to mention
this aspect to @cohosh in https://github.com/ooni/probe/issues/2004.)
2022-02-07 17:05:36 +01:00
|
|
|
MockableTunnelDir string
|
2021-04-02 12:03:18 +02:00
|
|
|
MockableUserAgent string
|
2021-02-02 12:05:47 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// GetTestHelpersByName implements ExperimentSession.GetTestHelpersByName
|
2022-01-03 13:53:23 +01:00
|
|
|
func (sess *Session) GetTestHelpersByName(name string) ([]model.OOAPIService, bool) {
|
2021-02-02 12:05:47 +01:00
|
|
|
services, okay := sess.MockableTestHelpers[name]
|
|
|
|
return services, okay
|
|
|
|
}
|
|
|
|
|
|
|
|
// DefaultHTTPClient implements ExperimentSession.DefaultHTTPClient
|
2022-07-08 11:08:10 +02:00
|
|
|
func (sess *Session) DefaultHTTPClient() model.HTTPClient {
|
2021-02-02 12:05:47 +01:00
|
|
|
return sess.MockableHTTPClient
|
|
|
|
}
|
|
|
|
|
2021-04-02 12:03:18 +02:00
|
|
|
// FetchPsiphonConfig implements ExperimentSession.FetchPsiphonConfig
|
|
|
|
func (sess *Session) FetchPsiphonConfig(ctx context.Context) ([]byte, error) {
|
|
|
|
return sess.MockableFetchPsiphonConfigResult, sess.MockableFetchPsiphonConfigErr
|
|
|
|
}
|
|
|
|
|
|
|
|
// FetchTorTargets implements ExperimentSession.TorTargets
|
|
|
|
func (sess *Session) FetchTorTargets(
|
2022-01-03 13:53:23 +01:00
|
|
|
ctx context.Context, cc string) (map[string]model.OOAPITorTarget, error) {
|
2021-04-02 12:03:18 +02:00
|
|
|
return sess.MockableFetchTorTargetsResult, sess.MockableFetchTorTargetsErr
|
|
|
|
}
|
|
|
|
|
|
|
|
// FetchURLList implements ExperimentSession.FetchURLList.
|
|
|
|
func (sess *Session) FetchURLList(
|
2022-01-03 13:53:23 +01:00
|
|
|
ctx context.Context, config model.OOAPIURLListConfig) ([]model.OOAPIURLInfo, error) {
|
2021-04-02 12:03:18 +02:00
|
|
|
return sess.MockableFetchURLListResult, sess.MockableFetchURLListErr
|
|
|
|
}
|
|
|
|
|
2021-02-02 12:05:47 +01:00
|
|
|
// KeyValueStore returns the configured key-value store.
|
|
|
|
func (sess *Session) KeyValueStore() model.KeyValueStore {
|
refactor: flatten and separate (#353)
* refactor(atomicx): move outside the engine package
After merging probe-engine into probe-cli, my impression is that we have
too much unnecessary nesting of packages in this repository.
The idea of this commit and of a bunch of following commits will instead
be to reduce the nesting and simplify the structure.
While there, improve the documentation.
* fix: always use the atomicx package
For consistency, never use sync/atomic and always use ./internal/atomicx
so we can just grep and make sure we're not risking to crash if we make
a subtle mistake on a 32 bit platform.
While there, mention in the contributing guidelines that we want to
always prefer the ./internal/atomicx package over sync/atomic.
* fix(atomicx): remove unnecessary constructor
We don't need a constructor here. The default constructed `&Int64{}`
instance is already usable and the constructor does not add anything to
what we are doing, rather it just creates extra confusion.
* cleanup(atomicx): we are not using Float64
Because atomicx.Float64 is unused, we can safely zap it.
* cleanup(atomicx): simplify impl and improve tests
We can simplify the implementation by using defer and by letting
the Load() method call Add(0).
We can improve tests by making many goroutines updated the
atomic int64 value concurrently.
* refactor(fsx): can live in the ./internal pkg
Let us reduce the amount of nesting. While there, ensure that the
package only exports the bare minimum, and improve the documentation
of the tests, to ease reading the code.
* refactor: move runtimex to ./internal
* refactor: move shellx into the ./internal package
While there, remove unnecessary dependency between packages.
While there, specify in the contributing guidelines that
one should use x/sys/execabs instead of os/exec.
* refactor: move ooapi into the ./internal pkg
* refactor(humanize): move to ./internal and better docs
* refactor: move platform to ./internal
* refactor(randx): move to ./internal
* refactor(multierror): move into the ./internal pkg
* refactor(kvstore): all kvstores in ./internal
Rather than having part of the kvstore inside ./internal/engine/kvstore
and part in ./internal/engine/kvstore.go, let us put every piece of code
that is kvstore related into the ./internal/kvstore package.
* fix(kvstore): always return ErrNoSuchKey on Get() error
It should help to use the kvstore everywhere removing all the
copies that are lingering around the tree.
* sessionresolver: make KVStore mandatory
Simplifies implementation. While there, use the ./internal/kvstore
package rather than having our private implementation.
* fix(ooapi): use the ./internal/kvstore package
* fix(platform): better documentation
2021-06-04 10:34:18 +02:00
|
|
|
return &kvstore.Memory{}
|
2021-02-02 12:05:47 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// Logger implements ExperimentSession.Logger
|
|
|
|
func (sess *Session) Logger() model.Logger {
|
|
|
|
return sess.MockableLogger
|
|
|
|
}
|
|
|
|
|
|
|
|
// MaybeResolverIP implements ExperimentSession.MaybeResolverIP.
|
|
|
|
func (sess *Session) MaybeResolverIP() string {
|
|
|
|
return sess.MockableMaybeResolverIP
|
|
|
|
}
|
|
|
|
|
|
|
|
// ProbeASNString implements ExperimentSession.ProbeASNString
|
|
|
|
func (sess *Session) ProbeASNString() string {
|
|
|
|
return sess.MockableProbeASNString
|
|
|
|
}
|
|
|
|
|
|
|
|
// ProbeCC implements ExperimentSession.ProbeCC
|
|
|
|
func (sess *Session) ProbeCC() string {
|
|
|
|
return sess.MockableProbeCC
|
|
|
|
}
|
|
|
|
|
|
|
|
// ProbeIP implements ExperimentSession.ProbeIP
|
|
|
|
func (sess *Session) ProbeIP() string {
|
|
|
|
return sess.MockableProbeIP
|
|
|
|
}
|
|
|
|
|
|
|
|
// ProbeNetworkName implements ExperimentSession.ProbeNetworkName
|
|
|
|
func (sess *Session) ProbeNetworkName() string {
|
|
|
|
return sess.MockableProbeNetworkName
|
|
|
|
}
|
|
|
|
|
|
|
|
// ProxyURL implements ExperimentSession.ProxyURL
|
|
|
|
func (sess *Session) ProxyURL() *url.URL {
|
|
|
|
return sess.MockableProxyURL
|
|
|
|
}
|
|
|
|
|
|
|
|
// ResolverIP implements ExperimentSession.ResolverIP
|
|
|
|
func (sess *Session) ResolverIP() string {
|
|
|
|
return sess.MockableResolverIP
|
|
|
|
}
|
|
|
|
|
|
|
|
// SoftwareName implements ExperimentSession.SoftwareName
|
|
|
|
func (sess *Session) SoftwareName() string {
|
|
|
|
return sess.MockableSoftwareName
|
|
|
|
}
|
|
|
|
|
|
|
|
// SoftwareVersion implements ExperimentSession.SoftwareVersion
|
|
|
|
func (sess *Session) SoftwareVersion() string {
|
|
|
|
return sess.MockableSoftwareVersion
|
|
|
|
}
|
|
|
|
|
|
|
|
// TempDir implements ExperimentSession.TempDir
|
|
|
|
func (sess *Session) TempDir() string {
|
|
|
|
return sess.MockableTempDir
|
|
|
|
}
|
|
|
|
|
|
|
|
// TorArgs implements ExperimentSession.TorArgs.
|
|
|
|
func (sess *Session) TorArgs() []string {
|
|
|
|
return sess.MockableTorArgs
|
|
|
|
}
|
|
|
|
|
|
|
|
// TorBinary implements ExperimentSession.TorBinary.
|
|
|
|
func (sess *Session) TorBinary() string {
|
|
|
|
return sess.MockableTorBinary
|
|
|
|
}
|
|
|
|
|
feat(torsf): collect tor logs, select rendezvous method, count bytes (#683)
This diff contains significant improvements over the previous
implementation of the torsf experiment.
We add support for configuring different rendezvous methods after
the convo at https://github.com/ooni/probe/issues/2004. In doing
that, I've tried to use a terminology that is consistent with the
names being actually used by tor developers.
In terms of what to do next, this diff basically instruments
torsf to always rendezvous using domain fronting. Yet, it's also
possible to change the rendezvous method from the command line,
when using miniooni, which allows to experiment a bit more. In the
same vein, by default we use a persistent tor datadir, but it's
also possible to use a temporary datadir using the cmdline.
Here's how a generic invocation of `torsf` looks like:
```bash
./miniooni -O DisablePersistentDatadir=true \
-O RendezvousMethod=amp \
-O DisableProgress=true \
torsf
```
(The default is `DisablePersistentDatadir=false` and
`RendezvousMethod=domain_fronting`.)
With this implementation, we can start measuring whether snowflake
and tor together can boostrap, which seems the most important thing
to focus on at the beginning. Understanding why the bootstrap most
often does not converge with a temporary datadir on Android devices
remains instead an open problem for now. (I'll also update the
relevant issues or create new issues after commit this.)
We also address some methodology improvements that were proposed
in https://github.com/ooni/probe/issues/1686. Namely:
1. we record the tor version;
2. we include the bootstrap percentage by reading the logs;
3. we set the anomaly key correctly;
4. we measure the bytes send and received (by `tor` not by `snowflake`, since
doing it for snowflake seems more complex at this stage).
What remains to be done is the possibility of including Snowflake
events into the measurement, which is not possible until the new
improvements at common/event in snowflake.git are included into a
tagged version of snowflake itself. (I'll make sure to mention
this aspect to @cohosh in https://github.com/ooni/probe/issues/2004.)
2022-02-07 17:05:36 +01:00
|
|
|
// TunnelDir implements ExperimentSession.TunnelDir.
|
|
|
|
func (sess *Session) TunnelDir() string {
|
|
|
|
return sess.MockableTunnelDir
|
|
|
|
}
|
|
|
|
|
2021-02-02 12:05:47 +01:00
|
|
|
// UserAgent implements ExperimentSession.UserAgent
|
|
|
|
func (sess *Session) UserAgent() string {
|
|
|
|
return sess.MockableUserAgent
|
|
|
|
}
|
|
|
|
|
|
|
|
var _ model.ExperimentSession = &Session{}
|
|
|
|
var _ probeservices.Session = &Session{}
|