tasks improvements

- fixed some race conditions.
- added more errors logging.

Author: gustavo-iniguez-goya

daemon/tasks/iocscanner/main.go

@@ -1,9 +1,9 @@
-package iocscanner
-
 // Copyright 2025 The OpenSnitch Authors. All rights reserved.
 // Use of this source code is governed by the GPLv3
 // license that can be found in the LICENSE file.
 
+package iocscanner
+
 import (
 	"context"
 	//"encoding/json"

daemon/tasks/iocscanner/tools/base/base.go

@@ -52,7 +52,7 @@ func (t *ToolBase) TransformLogline(line string) string {
 }
 
 func (t *ToolBase) Done() <-chan struct{} {
-	return t.Ctx.Done()
+	return t.Executer.Ctx.Done()
 }
 
 func (t *ToolBase) Stdout() chan string {

daemon/tasks/iocscanner/tools/dpkg/dpkg.go

@@ -10,6 +10,7 @@ import (
 	"os"
 	//"path/filepath"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/evilsocket/opensnitch/daemon/core"
@@ -120,6 +121,7 @@ func New(opts config.ToolOpts) *DpkgTool {
 				Cancel: cancel,
 				Stdout: make(chan string, opts.ReadBuffer),
 				Stderr: make(chan string, 0),
+				Mu:     &sync.RWMutex{},
 			},
 		},
 	}

daemon/tasks/iocscanner/tools/executer/executer.go

@@ -9,12 +9,15 @@ import (
 	"context"
 	"io"
 	"os/exec"
+	"sync"
 	"syscall"
 
 	"github.com/evilsocket/opensnitch/daemon/log"
 )
 
 type Executer struct {
+	Mu *sync.RWMutex
+
 	Ctx    context.Context
 	Cancel context.CancelFunc
 
@@ -29,15 +32,15 @@ func New() *Executer {
 	return &Executer{
 		Stdout: make(chan string, 0),
 		Stderr: make(chan string, 0),
+		Mu:     &sync.RWMutex{},
 	}
 }
 
 // Start launches the configured command.
 // It's a blocking operation.
 func (e *Executer) Start(bin string, args []string) {
 	log.Debug("[executer] Start() %s %v\n", bin, args)
-	e.Ctx, e.Cancel = context.WithCancel(context.Background())
-	e.isRunning = false
+	e.setRunning(false)
 
 	cmd := exec.CommandContext(e.Ctx, bin, args...)
 	stdout, err := cmd.StdoutPipe()
@@ -71,8 +74,8 @@ func (e *Executer) Start(bin string, args []string) {
 		log.Error("Executer.Start() %s", err)
 		return
 	}
-	e.isRunning = true
-	defer func() { e.isRunning = false }()
+	e.setRunning(true)
+	defer func() { e.setRunning(false) }()
 
 	if cmd.Process != nil {
 		syscall.Setpriority(syscall.PRIO_PROCESS, cmd.Process.Pid, e.Priority)
@@ -92,14 +95,22 @@ func (e *Executer) SetPriority(prio int) {
 	e.Priority = prio
 }
 
+func (e *Executer) setRunning(running bool) {
+	e.Mu.Lock()
+	e.isRunning = running
+	e.Mu.Unlock()
+}
+
 func (e *Executer) Running() bool {
+	e.Mu.RLock()
+	defer e.Mu.RUnlock()
 	return e.isRunning
 }
 
 func (e *Executer) Stop() {
-	log.Debug("[executer] Stop() running: %v", e.isRunning)
+	log.Debug("[executer] Stop() running: %v", e.Running())
 	if e.Running() && e.Cancel != nil {
 		e.Cancel()
 	}
-	e.isRunning = false
+	e.setRunning(false)
 }

daemon/tasks/iocscanner/tools/generic/generic.go

@@ -10,6 +10,7 @@ import (
 	"os"
 	//"path/filepath"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/evilsocket/opensnitch/daemon/core"
@@ -93,6 +94,7 @@ func New(opts config.ToolOpts) *GenericTool {
 				Cancel: cancel,
 				Stdout: make(chan string, opts.ReadBuffer),
 				Stderr: make(chan string, 0),
+				Mu:     &sync.RWMutex{},
 			},
 		},
 	}

daemon/tasks/main.go

@@ -136,7 +136,9 @@ func (tm *TaskManager) ResumeAll() {
 func (tm *TaskManager) StopAll() {
 	for name := range tm.tasks {
 		log.Debug("[tasks] Stopping task %s", name)
-		tm.RemoveTask(name)
+		if err := tm.RemoveTask(name); err != nil {
+			log.Debug("[tasks] Remove task error: %s", err)
+		}
 	}
 }
 
@@ -158,7 +160,9 @@ func (tm *TaskManager) StopTempTasks() {
 
 // GetTask ...
 func (tm *TaskManager) GetTask(name string) (tk base.Task, found bool) {
+	tm.mu.Lock()
 	tk, found = tm.tasks[name]
+	tm.mu.Unlock()
 	return
 }
 

daemon/tasks/scheduler/scheduler.go

@@ -44,6 +44,8 @@ type Scheduler struct {
 	TickChan chan time.Time
 	ticky    chan time.Time
 	Config   Config
+
+	mu *sync.RWMutex
 }
 
 func New(ctx context.Context, cancel context.CancelFunc, config Config) *Scheduler {
@@ -53,6 +55,7 @@ func New(ctx context.Context, cancel context.CancelFunc, config Config) *Schedul
 		TickChan: make(chan time.Time),
 		ticky:    make(chan time.Time),
 		Config:   config,
+		mu:       &sync.RWMutex{},
 	}
 
 	return sched
@@ -103,7 +106,9 @@ func (s *Scheduler) SetupDailyTimers() {
 				return
 			}
 			// save tickers to stop them later when stopping the scheduler.
+			s.mu.Lock()
 			s.Tickers = append(s.Tickers, tck)
+			s.mu.Unlock()
 
 			// wait for ticks while the tickers are active.
 			go func() {