d3c5196474
This diff changes the software name used by unattended runs for which we did not override the default software name (`ooniprobe-cli`). It will become `ooniprobe-cli-unattended`. This software name is in line with the one we use for Android, iOS, and desktop unattended runs. While working in this diff, I introduced string constants for the run types and a string constant for the default software name. See https://github.com/ooni/probe/issues/2081.
96 lines
2.8 KiB
Go
96 lines
2.8 KiB
Go
package run
|
|
|
|
import (
|
|
"github.com/alecthomas/kingpin"
|
|
"github.com/apex/log"
|
|
"github.com/fatih/color"
|
|
"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/onboard"
|
|
"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/root"
|
|
"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/nettests"
|
|
"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/ooni"
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
|
)
|
|
|
|
func init() {
|
|
cmd := root.Command("run", "Run a test group or OONI Run link")
|
|
noCollector := cmd.Flag("no-collector", "Disable uploading measurements to a collector").Bool()
|
|
|
|
var probe *ooni.Probe
|
|
cmd.Action(func(_ *kingpin.ParseContext) error {
|
|
var err error
|
|
probe, err = root.Init()
|
|
if err != nil {
|
|
log.Errorf("%s", err)
|
|
return err
|
|
}
|
|
if err = onboard.MaybeOnboarding(probe); err != nil {
|
|
log.WithError(err).Error("failed to perform onboarding")
|
|
return err
|
|
}
|
|
if *noCollector {
|
|
probe.Config().Sharing.UploadResults = false
|
|
}
|
|
return nil
|
|
})
|
|
|
|
functionalRun := func(runType model.RunType, pred func(name string, gr nettests.Group) bool) error {
|
|
for name, group := range nettests.All {
|
|
if !pred(name, group) {
|
|
continue
|
|
}
|
|
log.Infof("Running %s tests", color.BlueString(name))
|
|
conf := nettests.RunGroupConfig{
|
|
GroupName: name,
|
|
Probe: probe,
|
|
RunType: runType,
|
|
}
|
|
if err := nettests.RunGroup(conf); err != nil {
|
|
log.WithError(err).Errorf("failed to run %s", name)
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
genRunWithGroupName := func(targetName string) func(*kingpin.ParseContext) error {
|
|
return func(*kingpin.ParseContext) error {
|
|
return functionalRun(model.RunTypeManual, func(groupName string, gr nettests.Group) bool {
|
|
return groupName == targetName
|
|
})
|
|
}
|
|
}
|
|
|
|
websitesCmd := cmd.Command("websites", "")
|
|
inputFile := websitesCmd.Flag("input-file", "File containing input URLs").Strings()
|
|
input := websitesCmd.Flag("input", "Test the specified URL").Strings()
|
|
websitesCmd.Action(func(_ *kingpin.ParseContext) error {
|
|
log.Infof("Running %s tests", color.BlueString("websites"))
|
|
return nettests.RunGroup(nettests.RunGroupConfig{
|
|
GroupName: "websites",
|
|
Probe: probe,
|
|
InputFiles: *inputFile,
|
|
Inputs: *input,
|
|
RunType: model.RunTypeManual,
|
|
})
|
|
})
|
|
|
|
easyRuns := []string{
|
|
"im", "performance", "circumvention", "middlebox", "experimental"}
|
|
for _, name := range easyRuns {
|
|
cmd.Command(name, "").Action(genRunWithGroupName(name))
|
|
}
|
|
|
|
unattendedCmd := cmd.Command("unattended", "")
|
|
unattendedCmd.Action(func(_ *kingpin.ParseContext) error {
|
|
return functionalRun(model.RunTypeTimed, func(name string, gr nettests.Group) bool {
|
|
return gr.UnattendedOK
|
|
})
|
|
})
|
|
|
|
allCmd := cmd.Command("all", "").Default()
|
|
allCmd.Action(func(_ *kingpin.ParseContext) error {
|
|
return functionalRun(model.RunTypeManual, func(name string, gr nettests.Group) bool {
|
|
return true
|
|
})
|
|
})
|
|
}
|