refactor(netx): remove the self censorship mechanism (#364)
We're currently use jafar for QA and jafar is a better mechanism, even though it is not portable outside of Linux. This self censorship mechanism was less cool and added a bunch of (also cognitive) complexity to netx. If we ever want to go down a self censorship like road, we probably want to do as little work as possible in the problem and as much work as possible inside a helper like jafar. Part of https://github.com/ooni/probe/issues/1591.
This commit is contained in:
@@ -19,7 +19,6 @@ import (
|
||||
"github.com/ooni/probe-cli/v3/internal/engine"
|
||||
"github.com/ooni/probe-cli/v3/internal/engine/legacy/assetsdir"
|
||||
"github.com/ooni/probe-cli/v3/internal/engine/model"
|
||||
"github.com/ooni/probe-cli/v3/internal/engine/netx/selfcensor"
|
||||
"github.com/ooni/probe-cli/v3/internal/humanize"
|
||||
"github.com/ooni/probe-cli/v3/internal/kvstore"
|
||||
"github.com/ooni/probe-cli/v3/internal/version"
|
||||
@@ -41,7 +40,6 @@ type Options struct {
|
||||
Proxy string
|
||||
Random bool
|
||||
ReportFile string
|
||||
SelfCensorSpec string
|
||||
TorArgs []string
|
||||
TorBinary string
|
||||
Tunnel string
|
||||
@@ -108,10 +106,6 @@ func init() {
|
||||
&globalOptions.ReportFile, "reportfile", 'o',
|
||||
"Set the report file path", "PATH",
|
||||
)
|
||||
getopt.FlagLong(
|
||||
&globalOptions.SelfCensorSpec, "self-censor-spec", 0,
|
||||
"Enable and configure self censorship", "JSON",
|
||||
)
|
||||
getopt.FlagLong(
|
||||
&globalOptions.TorArgs, "tor-args", 0,
|
||||
"Extra args for tor binary (may be specified multiple times)",
|
||||
@@ -305,9 +299,6 @@ func MainWithConfiguration(experimentName string, currentOptions Options) {
|
||||
extraOptions := mustMakeMap(currentOptions.ExtraOptions)
|
||||
annotations := mustMakeMap(currentOptions.Annotations)
|
||||
|
||||
err := selfcensor.MaybeEnable(currentOptions.SelfCensorSpec)
|
||||
fatalOnError(err, "cannot parse --self-censor-spec argument")
|
||||
|
||||
logger := &log.Logger{Level: log.InfoLevel, Handler: &logHandler{Writer: os.Stderr}}
|
||||
if currentOptions.Verbose {
|
||||
logger.Level = log.DebugLevel
|
||||
@@ -323,7 +314,7 @@ func MainWithConfiguration(experimentName string, currentOptions Options) {
|
||||
homeDir := gethomedir(currentOptions.HomeDir)
|
||||
fatalIfFalse(homeDir != "", "home directory is empty")
|
||||
miniooniDir := path.Join(homeDir, ".miniooni")
|
||||
err = os.MkdirAll(miniooniDir, 0700)
|
||||
err := os.MkdirAll(miniooniDir, 0700)
|
||||
fatalOnError(err, "cannot create $HOME/.miniooni directory")
|
||||
|
||||
// We cleanup the assets files used by versions of ooniprobe
|
||||
|
||||
Reference in New Issue
Block a user