Real-time monitoring dashboard for Proxmox VE, PBS, Docker, Kubernetes, TrueNAS and vSphere. Self-hosted, with alerts for failed backups, full disks, unhealthy containers and offline nodes.
Go aialertsdashboarddockerdocker-monitoringgohomelabinfrastructure-monitoringkubernetesmonitoringmspproxmoxproxmox-backup-serverproxmox-mail-gatewayproxmox-veself-hostedtruenastypescriptvspherewebhooks
Keep canceled VM lock evidence an explicit execution deferral
pulse-triage[bot]2a734a5c5316
diff --git a/internal/hostagent/commands.go b/internal/hostagent/commands.goindex 83009ec278..cb7bd06a49 100644--- a/internal/hostagent/commands.go+++ b/internal/hostagent/commands.go@@ -1584,6 +1584,9 @@ func (c *CommandClient) executeCommand(ctx context.Context, payload executeCommarelease, err := guard.acquire(cmdCtx, vmid)if err != nil {result.Error = err.Error()+ if !agentexec.IsGuestExecDeferred(result.Error) {+ result.Error = agentexec.GuestExecDeferred("the command was canceled before guest admission").Error()+ }result.ExitCode = -1return result}diff --git a/internal/hostagent/guest_exec_guard.go b/internal/hostagent/guest_exec_guard.goindex 0f3457aff5..6940223ef0 100644--- a/internal/hostagent/guest_exec_guard.go+++ b/internal/hostagent/guest_exec_guard.go@@ -102,10 +102,10 @@ func (g *guestExecGuard) acquire(ctx context.Context, vmid string) (func(bool),func (g *guestExecGuard) verifyUnlocked(ctx context.Context, vmid string) error {if err := ctx.Err(); err != nil {- return err+ return agentexec.GuestExecDeferred(agentexec.GuestExecLockUnverified)}config, err := g.readConfig(ctx, vmid)- if err != nil {+ if err != nil || ctx.Err() != nil {return agentexec.GuestExecDeferred(agentexec.GuestExecLockUnverified)}lock, valid := guestExecConfigLock(config)diff --git a/internal/hostagent/guest_exec_guard_test.go b/internal/hostagent/guest_exec_guard_test.goindex 08d27a1e30..d99cc36da4 100644--- a/internal/hostagent/guest_exec_guard_test.go+++ b/internal/hostagent/guest_exec_guard_test.go@@ -205,3 +205,24 @@ func TestGuestExecCanceledHandoffNeverRetriesAndRechecksOnExplicitResumption(t *t.Fatalf("explicit resumption failed: %#v", got)}}++func TestGuestExecCanceledLockCheckCannotPublishSuccessfulEvidence(t *testing.T) {+ ctx, cancel := context.WithCancel(context.Background())+ var reads atomic.Int32+ g := newGuestExecGuard(func(context.Context, string) ([]byte, error) {+ reads.Add(1)+ cancel() // config completion races the caller's cancellation+ return []byte("name: vm\n"), nil+ })+ if err := g.verifyUnlocked(ctx, "105"); err == nil || !agentexec.IsGuestExecDeferred(err.Error()) {+ t.Fatalf("canceled read became unlocked evidence: %v", err)+ }+ if err := g.verifyUnlocked(ctx, "105"); err == nil || !agentexec.IsGuestExecDeferred(err.Error()) || reads.Load() != 1 {+ t.Fatalf("already canceled check lost deferral or reread: %v reads=%d", err, reads.Load())+ }+ c := &CommandClient{guestExecAdmission: g}+ payload := testApprovedCommandPayload(t, c, executeCommandPayload{Command: "echo original", TargetType: "vm", TargetID: "105", Trusted: true})+ if got := c.executeCommand(ctx, payload); got.Success || !agentexec.IsGuestExecDeferred(got.Error) || got.Stdout != "" || reads.Load() != 1 {+ t.Fatalf("canceled admission was not an explicit safety pause: %#v", got)+ }+}