fix: close Ticket 11 hardening review gaps

This commit is contained in:
proxyctl coordinator
2026-07-18 02:04:26 +08:00
parent f15ffc2301
commit ed8b527f1f
15 changed files with 1045 additions and 175 deletions
-72
View File
@@ -2,12 +2,10 @@ package main
import (
"bytes"
"context"
"os"
"path/filepath"
"strings"
"testing"
"time"
"proxyctl/internal/profile"
"proxyctl/internal/target"
@@ -88,76 +86,6 @@ func TestDefaultInvocationUsesAlternateScreenAndRestoresItOnExit(t *testing.T) {
}
}
type blockingDetectionTarget struct {
started chan struct{}
release chan struct{}
}
func (t *blockingDetectionTarget) ID() string { return "blocking-test" }
func (t *blockingDetectionTarget) Description() target.Description {
return target.Description{Name: "Blocking test Target"}
}
func (t *blockingDetectionTarget) Availability(context.Context) target.Availability {
return target.Availability{Available: true}
}
func (t *blockingDetectionTarget) Inspect(context.Context, *profile.Profile) target.Inspection {
return target.Inspection{State: target.Disabled}
}
func (t *blockingDetectionTarget) Confirmation(bool) string { return "" }
func (t *blockingDetectionTarget) SetDesired(context.Context, bool, *profile.Profile) target.OperationResult {
return target.OperationResult{}
}
func (t *blockingDetectionTarget) Detect(context.Context, *profile.Profile) target.Detection {
select {
case t.started <- struct{}{}:
default:
}
<-t.release
return target.Detection{
Availability: target.Availability{Available: true, Evidence: "hermetic test Target"},
Inspection: target.Inspection{State: target.Disabled, Evidence: "no configuration"},
}
}
func TestDeferredExitCompletesSafelyAndRestoresAlternateScreen(t *testing.T) {
t.Setenv("XDG_CONFIG_HOME", t.TempDir())
adapter := &blockingDetectionTarget{started: make(chan struct{}, 1), release: make(chan struct{})}
var output bytes.Buffer
done := make(chan error, 1)
go func() {
done <- runWithSystemTargets(nil, strings.NewReader("q"), &output, []target.Target{adapter})
}()
select {
case <-adapter.started:
case err := <-done:
t.Fatalf("TUI exited before progressive startup began: %v", err)
case <-time.After(5 * time.Second):
t.Fatal("progressive startup did not reach the hermetic Target")
}
select {
case err := <-done:
t.Fatalf("deferred exit returned before safe operation completion: %v", err)
case <-time.After(50 * time.Millisecond):
}
close(adapter.release)
select {
case err := <-done:
if err != nil {
t.Fatalf("run proxyctl: %v", err)
}
case <-time.After(5 * time.Second):
t.Fatal("TUI did not exit after safe operation completion")
}
frame := output.String()
enter := strings.Index(frame, "\x1b[?1049h")
leave := strings.LastIndex(frame, "\x1b[?1049l")
if enter < 0 || leave <= enter {
t.Fatalf("deferred exit did not enter and restore the alternate screen in order: %q", frame)
}
}
func TestDefaultInvocationLoadsPersistedActiveProfile(t *testing.T) {
xdg := t.TempDir()
t.Setenv("XDG_CONFIG_HOME", xdg)