security: use os.Root API for file path logic#1279
Merged
Conversation
keegancsmith
approved these changes
Mar 26, 2026
| @@ -129,31 +129,43 @@ func (svc *Service) UploadBatchSpecWorkspaceFiles(ctx context.Context, workingDi | |||
| } | |||
|
|
|||
| func getFilePaths(workingDir, filePath string) ([]string, error) { | |||
Member
There was a problem hiding this comment.
any idea why this implementation didn't just use filepath.Walk instead of implementing its own recursion?
Contributor
Author
There was a problem hiding this comment.
According to deepsearch, it's to preserve the relative path structure from a particular working directory
bahrmichael
approved these changes
Mar 27, 2026
bahrmichael
reviewed
Mar 27, 2026
| } | ||
|
|
||
| func getAbsoluteMountPath(batchSpecDir string, mountPath string) (string, error) { | ||
| root, err := os.OpenRoot(batchSpecDir) |
Contributor
There was a problem hiding this comment.
I would appreciate a comment here for future devs to tell them why this should be used.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Problem
Mount path validation in
src batchusesstrings.HasPrefixon non-canonical paths andos.Statwhich follows symlinks. This allowed two bypass techniques:/tmp/specdir-123-outside/secret.txtpasses a HasPrefix check against/tmp/specdir-123os.Statand the prefix checkSolution
Replace all os.Stat/os.Open/os.ReadDir + strings.HasPrefix path validation with Go's os.OpenRoot API, which enforces directory confinement at the OS level — blocking symlink escapes, .. traversal, and prefix confusion.
Test plan
Added new tests which pass, also verified locally.