-
Notifications
You must be signed in to change notification settings - Fork 193
fix(sandbox): announce degraded native enforcement at TUI session start and on exec stderr #1107
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
FabioLeitao
wants to merge
1
commit into
Twigpine:main
Choose a base branch
from
FabioLeitao:pr/1041-sandbox-degraded-notice
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| package sandbox | ||
|
|
||
| import ( | ||
| "strings" | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestEnforcementWarningUsesManagerDecision(t *testing.T) { | ||
| t.Setenv(EnvSandboxed, "") | ||
| t.Setenv(EnvSandboxBackend, "") | ||
| workspace := t.TempDir() | ||
|
|
||
| t.Run("degraded", func(t *testing.T) { | ||
| engine := NewEngine(EngineOptions{ | ||
| WorkspaceRoot: workspace, | ||
| Policy: DefaultPolicy(), | ||
| Backend: Backend{ | ||
| Name: BackendUnavailable, | ||
| Platform: "linux", | ||
| Message: "Linux sandbox helper is not available", | ||
| }, | ||
| }) | ||
|
|
||
| level, reason := engine.EnforcementStatus() | ||
| if level != EnforcementDegraded || reason != "Linux sandbox helper is not available" { | ||
| t.Fatalf("EnforcementStatus() = %q, %q; want degraded with helper reason", level, reason) | ||
| } | ||
| warning := EnforcementWarning(engine) | ||
| for _, want := range []string{"degraded", reason, "zero doctor"} { | ||
| if !strings.Contains(warning, want) { | ||
| t.Fatalf("EnforcementWarning() = %q, want %q", warning, want) | ||
| } | ||
| } | ||
| }) | ||
|
|
||
| t.Run("native", func(t *testing.T) { | ||
| engine := NewEngine(EngineOptions{ | ||
| WorkspaceRoot: workspace, | ||
| Policy: DefaultPolicy(), | ||
| Backend: Backend{ | ||
| Name: BackendLinuxBwrap, | ||
| Available: true, | ||
| Platform: "linux", | ||
| Executable: "/usr/bin/zero-linux-sandbox", | ||
| }, | ||
| }) | ||
| if warning := EnforcementWarning(engine); warning != "" { | ||
| t.Fatalf("EnforcementWarning() = %q, want silence for native enforcement", warning) | ||
| } | ||
| }) | ||
|
|
||
| t.Run("disabled", func(t *testing.T) { | ||
| policy := DefaultPolicy() | ||
| policy.Mode = ModeDisabled | ||
| engine := NewEngine(EngineOptions{ | ||
| WorkspaceRoot: workspace, | ||
| Policy: policy, | ||
| Backend: Backend{ | ||
| Name: BackendUnavailable, | ||
| Platform: "linux", | ||
| }, | ||
| }) | ||
| if warning := EnforcementWarning(engine); warning != "" { | ||
| t.Fatalf("EnforcementWarning() = %q, want silence for explicitly disabled sandbox", warning) | ||
| } | ||
| }) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🎯 Functional Correctness | 🟡 Minor | ⚡ Quick win
Clear sandbox markers in both degraded-warning tests.
When these tests run inside a Zero sandbox, inherited
EnvSandboxedandEnvSandboxBackendselect the nested-sandbox pass-through path. The degraded warning stays empty, so the assertions fail despite the injected unavailable backend.internal/cli/exec_test.go#L655-L655: Addt.Setenv(sandbox.EnvSandboxed, "")andt.Setenv(sandbox.EnvSandboxBackend, "")before constructing the engine.internal/tui/startup_test.go#L55-L55: Clear the same two markers before constructing the engine.📍 Affects 2 files
internal/cli/exec_test.go#L655-L655(this comment)internal/tui/startup_test.go#L55-L55🤖 Prompt for AI Agents