-
Notifications
You must be signed in to change notification settings - Fork 445
fix: reclaim stale root-owned /tmp/gh-aw before AWF invocation #44022
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
Merged
+41
−5
Merged
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -143,14 +143,22 @@ func generateFirewallLogParsingStep(workflowName string, workflowData *WorkflowD | |
| " run: |", | ||
| } | ||
|
|
||
| // When sudo is false (network isolation mode), AWF runs rootless so firewall files | ||
| // are not owned by root — skip the sudo chmod permission-fix step. | ||
| // When sudo is false (network isolation mode), AWF runs rootless but Docker | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good clarification in this comment — noting that Docker containers write as non-runner UIDs (e.g. Squid UID 13) makes the rationale much clearer. |
||
| // containers still write files as non-runner UIDs (e.g., Squid writes as UID 13). | ||
| // AWF's own post-run cleanup (fixArtifactPermissionsForRootless) normally handles | ||
| // this, but if AWF is killed by timeout or OOM, the cleanup never runs. | ||
| // Use a non-sudo chmod as a best-effort fallback for artifact upload accessibility. | ||
| if !isAWFNetworkIsolationEnabled(workflowData) { | ||
| stepLines = append(stepLines, | ||
| " # Fix permissions on firewall logs/audit dirs so they can be uploaded as artifacts", | ||
| " # AWF runs with sudo, creating files owned by root", | ||
| fmt.Sprintf(" sudo chmod -R a+rX %s 2>/dev/null || true", firewallDir), | ||
| ) | ||
| } else { | ||
| stepLines = append(stepLines, | ||
| " # Best-effort permission fix for artifact upload (AWF cleanup may not have run)", | ||
| fmt.Sprintf(" sudo -n chmod -R a+rX %[1]s 2>/dev/null || chmod -R a+rX %[1]s 2>/dev/null || true", firewallDir), | ||
| ) | ||
| } | ||
|
Copilot marked this conversation as resolved.
|
||
|
|
||
| stepLines = append(stepLines, | ||
|
|
||
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
Oops, something went wrong.
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.
The passwordless
sudo -n rm -rffallback is a solid approach for GitHub-hosted runners. Consider logging when the sudo path is taken to aid future debugging.