feat: Add POSTROUTING MASQUERADE and periodic state reconciliation
continuous-integration/drone/push Build is passing

- Add POSTROUTING MASQUERADE rule alongside DNAT rules to ensure return
  traffic from container targets can route back through the same interface,
  matching legacy shell script behavior
- Enhance FileWatcher to trigger periodic state reconciliation every tick
  regardless of config file changes, ensuring desired state is maintained
  after container restarts or iptables flushes
This commit is contained in:
gyurix
2026-06-15 22:40:43 +02:00
parent 27607d1a2e
commit bf94206849
3 changed files with 66 additions and 29 deletions
+34 -17
View File
@@ -9,23 +9,27 @@ import (
"firewall_containers/network-go/logger"
)
// FileWatcher periodically checks a file for changes using MD5 hash
// FileWatcher periodically polls a file for changes AND triggers a periodic
// reconciliation callback regardless of file changes.
type FileWatcher struct {
path string
period time.Duration
lastHash string
onChange func()
stopCh chan struct{}
path string
period time.Duration
lastHash string
onChange func()
stopCh chan struct{}
}
// NewFileWatcher creates a new file watcher that polls the file at the given period
// NewFileWatcher creates a new file watcher that:
// 1. Polls the file for content changes at the given period
// 2. Triggers a reconciliation callback every period regardless of changes
// to ensure desired state is maintained (stateful reconciliation)
func NewFileWatcher(path string, period time.Duration, onChange func()) *FileWatcher {
return &FileWatcher{
path: path,
period: period,
lastHash: "",
onChange: onChange,
stopCh: make(chan struct{}),
path: path,
period: period,
lastHash: "",
onChange: onChange,
stopCh: make(chan struct{}),
}
}
@@ -38,7 +42,9 @@ func (fw *FileWatcher) hashFile() (string, error) {
return fmt.Sprintf("%x", md5.Sum(data)), nil
}
// Start begins polling the file for changes in a goroutine
// Start begins polling the file for changes in a goroutine.
// Every period, it checks if the file changed AND triggers a full reconciliation
// to maintain the desired state (handles container restarts, iptables flushes, etc.)
func (fw *FileWatcher) Start() {
// Compute initial hash
hash, err := fw.hashFile()
@@ -52,7 +58,7 @@ func (fw *FileWatcher) Start() {
ticker := time.NewTicker(fw.period)
defer ticker.Stop()
logger.Info("WATCHER: started watching %s every %s", fw.path, fw.period)
logger.Info("WATCHER: started watching %s every %s (periodic reconciliation enabled)", fw.path, fw.period)
for {
select {
@@ -66,12 +72,23 @@ func (fw *FileWatcher) Start() {
continue
}
if hash != fw.lastHash {
fileChanged := hash != fw.lastHash
if fileChanged {
logger.Info("WATCHER: detected change in %s", fw.path)
fw.lastHash = hash
if fw.onChange != nil {
fw.onChange()
}
// Trigger reconciliation every period to maintain state,
// even if the config file hasn't changed.
// This ensures container restarts, iptable flushes, etc.
// are corrected.
if fw.onChange != nil {
if fileChanged {
logger.Info("WATCHER: triggering reconciliation (config changed)")
} else {
logger.Debug("WATCHER: triggering periodic state reconciliation")
}
fw.onChange()
}
}
}
+8 -12
View File
@@ -52,12 +52,11 @@ func TestWatcherNoChange(t *testing.T) {
t.Fatalf("failed to write test file: %v", err)
}
changeDetected := make(chan bool, 1)
// With periodic reconciliation, onChange will be called every period.
// Count how many times it's called within the wait period.
callCount := 0
onChange := func() {
select {
case changeDetected <- true:
default:
}
callCount++
}
fw := NewFileWatcher(path, 100*time.Millisecond, onChange)
@@ -65,14 +64,11 @@ func TestWatcherNoChange(t *testing.T) {
defer fw.Stop()
// Wait without modifying the file
time.Sleep(300 * time.Millisecond)
time.Sleep(350 * time.Millisecond)
// Should not detect a change
select {
case <-changeDetected:
t.Error("unexpected change detection without file modification")
default:
// Expected: no change detected
// onChange should have been called ~3 times (0s, 0.1s, 0.2s, 0.3s) for periodic reconciliation
if callCount < 1 {
t.Errorf("expected at least 1 periodic reconciliation call, got %d", callCount)
}
}