040bee0ee6
* Optionally treat EOF on stdin just like SIGTERM On Unix, Node.js allows us to gracefully kill a process. On Windows this is more compex. You certainly cannot rely on the default `kill()` function, which calls `TerminateProcess`. There is a bunch of C/C++ extensions that in principle allow you to attempt to gracefully shutdown a Windows process. But, hey, here's a reality check. Node.js controls our stdin. Node.js does IPC easy. Controlling uv_spawn flags and using the right not well maintained C/C++ Node.js extension to kill a process is fragile. So, treat EOF and any other error on stdin as equivalent to SIGTERM. However, systemd. The sane thing to do with systemd is `StandardInput=null`. With such configuration, stdin immediately returns EOF. Then, introduce the `OONI_STDIN_EOF_IMPLIES_SIGTERM` environment variable. When it is `true`, this behaviour is enabled, e.g.: ```bash export OONI_STDIN_EOF_IMPLIES_SIGTERM=true # behaviour enabled ooniprobe run ``` I want the default to be disabled because: 1. in the future we may find a better way to solve this problem and I don't want the _default behaviour_ to change in such case 2. we know we need this knob for ooniprobe-desktop, and we will not fail to provide it, so it won't suprise/damage us 3. a person trying to write a systemd unit for ooniprobe would be very surprised to find out they need to disable this behaviour, if it was enabled by default by this PR Hence, I believe this design is consistent with designing for the future and for trying to minimize surprises. Also, why an environment variable and not a command line flag? Because: 1. we don't want such hypothetical flag to be available where it does not make sense, e.g., for all subcommands but `run` 2. we don't want the ooni/probe-desktop app to write conditional code because it needs to check the command we're using and then decide whether to add such hypothetical flag Also, why not enabling this only on Windows? Because again we don't want the ooni/probe-desktop app to write conditional code. To summarize: we want ooni/probe-desktop app to see the same behaviour everywhere and we want others to be the least surprised. Related to https://github.com/ooni/probe/issues/1005 * Update ooni.go
215 lines
5.3 KiB
Go
215 lines
5.3 KiB
Go
package ooni
|
|
|
|
import (
|
|
"io/ioutil"
|
|
"os"
|
|
"os/signal"
|
|
"sync/atomic"
|
|
"syscall"
|
|
|
|
"github.com/apex/log"
|
|
"github.com/ooni/probe-cli/config"
|
|
"github.com/ooni/probe-cli/internal/bindata"
|
|
"github.com/ooni/probe-cli/internal/database"
|
|
"github.com/ooni/probe-cli/internal/enginex"
|
|
"github.com/ooni/probe-cli/utils"
|
|
engine "github.com/ooni/probe-engine"
|
|
"github.com/pkg/errors"
|
|
"upper.io/db.v3/lib/sqlbuilder"
|
|
)
|
|
|
|
// Context for OONI Probe
|
|
type Context struct {
|
|
Config *config.Config
|
|
DB sqlbuilder.Database
|
|
IsBatch bool
|
|
Session *engine.Session
|
|
|
|
Home string
|
|
TempDir string
|
|
|
|
dbPath string
|
|
configPath string
|
|
|
|
// We need to use a int64 in order to use the atomic.AddInt64/LoadInt64
|
|
// operations to ensure consistent reads of the variables.
|
|
isTerminatedAtomicInt int64
|
|
}
|
|
|
|
// MaybeLocationLookup will lookup the location of the user unless it's already cached
|
|
func (c *Context) MaybeLocationLookup() error {
|
|
return c.Session.MaybeLookupLocation()
|
|
}
|
|
|
|
// IsTerminated checks to see if the isTerminatedAtomicInt is set to a non zero
|
|
// value and therefore we have received the signal to shutdown the running test
|
|
func (c *Context) IsTerminated() bool {
|
|
i := atomic.LoadInt64(&c.isTerminatedAtomicInt)
|
|
return i != 0
|
|
}
|
|
|
|
// Terminate interrupts the running context
|
|
func (c *Context) Terminate() {
|
|
atomic.AddInt64(&c.isTerminatedAtomicInt, 1)
|
|
}
|
|
|
|
// ListenForSignals will listen for SIGINT and SIGTERM. When it receives those
|
|
// signals it will set isTerminatedAtomicInt to non-zero, which will cleanly
|
|
// shutdown the test logic.
|
|
//
|
|
// TODO refactor this to use a cancellable context.Context instead of a bool
|
|
// flag, probably as part of: https://github.com/ooni/probe-cli/issues/45
|
|
func (c *Context) ListenForSignals() {
|
|
s := make(chan os.Signal, 1)
|
|
signal.Notify(s, os.Interrupt, syscall.SIGINT, syscall.SIGTERM)
|
|
go func() {
|
|
<-s
|
|
log.Info("caught a stop signal, shutting down cleanly")
|
|
c.Terminate()
|
|
}()
|
|
}
|
|
|
|
// MaybeListenForStdinClosed will treat any error on stdin just
|
|
// like SIGTERM if and only if
|
|
//
|
|
// os.Getenv("OONI_STDIN_EOF_IMPLIES_SIGTERM") == "true"
|
|
//
|
|
// When this feature is enabled, a collateral effect is that we swallow
|
|
// whatever is passed to us on the standard input.
|
|
//
|
|
// See https://github.com/ooni/probe-cli/pull/111 for more info
|
|
// regarding the design of this functionality.
|
|
//
|
|
// TODO refactor this to use a cancellable context.Context instead of a bool
|
|
// flag, probably as part of: https://github.com/ooni/probe-cli/issues/45
|
|
func (c *Context) MaybeListenForStdinClosed() {
|
|
if os.Getenv("OONI_STDIN_EOF_IMPLIES_SIGTERM") != "true" {
|
|
return
|
|
}
|
|
go func() {
|
|
defer c.Terminate()
|
|
defer log.Info("stdin closed, shutting down cleanly")
|
|
b := make([]byte, 1<<10)
|
|
for {
|
|
if _, err := os.Stdin.Read(b); err != nil {
|
|
return
|
|
}
|
|
}
|
|
}()
|
|
}
|
|
|
|
// Init the OONI manager
|
|
func (c *Context) Init(softwareName, softwareVersion string) error {
|
|
var err error
|
|
|
|
if err = MaybeInitializeHome(c.Home); err != nil {
|
|
return err
|
|
}
|
|
|
|
if c.configPath != "" {
|
|
log.Debugf("Reading config file from %s", c.configPath)
|
|
c.Config, err = config.ReadConfig(c.configPath)
|
|
} else {
|
|
log.Debug("Reading default config file")
|
|
c.Config, err = InitDefaultConfig(c.Home)
|
|
}
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if err = c.Config.MaybeMigrate(); err != nil {
|
|
return errors.Wrap(err, "migrating config")
|
|
}
|
|
|
|
c.dbPath = utils.DBDir(c.Home, "main")
|
|
log.Debugf("Connecting to database sqlite3://%s", c.dbPath)
|
|
db, err := database.Connect(c.dbPath)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
c.DB = db
|
|
|
|
tempDir, err := ioutil.TempDir("", "ooni")
|
|
if err != nil {
|
|
return errors.Wrap(err, "creating TempDir")
|
|
}
|
|
c.TempDir = tempDir
|
|
|
|
kvstore, err := engine.NewFileSystemKVStore(
|
|
utils.EngineDir(c.Home),
|
|
)
|
|
if err != nil {
|
|
return errors.Wrap(err, "creating engine's kvstore")
|
|
}
|
|
|
|
sess, err := engine.NewSession(engine.SessionConfig{
|
|
KVStore: kvstore,
|
|
Logger: enginex.Logger,
|
|
SoftwareName: softwareName,
|
|
SoftwareVersion: softwareVersion,
|
|
AssetsDir: utils.AssetsDir(c.Home),
|
|
TempDir: c.TempDir,
|
|
})
|
|
if err != nil {
|
|
return err
|
|
}
|
|
c.Session = sess
|
|
|
|
return nil
|
|
}
|
|
|
|
// NewContext creates a new context instance.
|
|
func NewContext(configPath string, homePath string) *Context {
|
|
return &Context{
|
|
Home: homePath,
|
|
Config: &config.Config{},
|
|
configPath: configPath,
|
|
isTerminatedAtomicInt: 0,
|
|
}
|
|
}
|
|
|
|
// MaybeInitializeHome does the setup for a new OONI Home
|
|
func MaybeInitializeHome(home string) error {
|
|
for _, d := range utils.RequiredDirs(home) {
|
|
if _, e := os.Stat(d); e != nil {
|
|
if err := os.MkdirAll(d, 0700); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// InitDefaultConfig reads the config from common locations or creates it if
|
|
// missing.
|
|
func InitDefaultConfig(home string) (*config.Config, error) {
|
|
var (
|
|
err error
|
|
c *config.Config
|
|
configPath = utils.ConfigPath(home)
|
|
)
|
|
|
|
c, err = config.ReadConfig(configPath)
|
|
if err != nil {
|
|
if os.IsNotExist(err) {
|
|
log.Debugf("writing default config to %s", configPath)
|
|
var data []byte
|
|
data, err = bindata.Asset("data/default-config.json")
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
err = ioutil.WriteFile(
|
|
configPath,
|
|
data,
|
|
0644,
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return InitDefaultConfig(home)
|
|
}
|
|
return nil, err
|
|
}
|
|
|
|
return c, nil
|
|
}
|