-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
Fixed permission issues on client #1960
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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 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 |
---|---|---|
|
@@ -313,13 +313,12 @@ func (d *AllocDir) Embed(task string, entries map[string]string) error { | |
|
||
// Embedding a single file | ||
if !s.IsDir() { | ||
destDir := filepath.Join(taskdir, filepath.Dir(dest)) | ||
if err := os.MkdirAll(destDir, s.Mode().Perm()); err != nil { | ||
return fmt.Errorf("Couldn't create destination directory %v: %v", destDir, err) | ||
if err := d.createDir(taskdir, filepath.Dir(dest)); err != nil { | ||
return fmt.Errorf("Couldn't create destination directory %v: %v", dest, err) | ||
} | ||
|
||
// Copy the file. | ||
taskEntry := filepath.Join(destDir, filepath.Base(dest)) | ||
taskEntry := filepath.Join(taskdir, dest) | ||
if err := d.linkOrCopy(source, taskEntry, s.Mode().Perm()); err != nil { | ||
return err | ||
} | ||
|
@@ -329,7 +328,8 @@ func (d *AllocDir) Embed(task string, entries map[string]string) error { | |
|
||
// Create destination directory. | ||
destDir := filepath.Join(taskdir, dest) | ||
if err := os.MkdirAll(destDir, s.Mode().Perm()); err != nil { | ||
|
||
if err := d.createDir(taskdir, dest); err != nil { | ||
return fmt.Errorf("Couldn't create destination directory %v: %v", destDir, err) | ||
} | ||
|
||
|
@@ -565,3 +565,67 @@ func (d *AllocDir) GetSecretDir(task string) (string, error) { | |
return filepath.Join(t, TaskSecrets), nil | ||
} | ||
} | ||
|
||
// createDir creates a directory structure inside the basepath. This functions | ||
// preserves the permissions of each of the subdirectories in the relative path | ||
// by looking up the permissions in the host. | ||
func (d *AllocDir) createDir(basePath, relPath string) error { | ||
filePerms, err := d.splitPath(relPath) | ||
if err != nil { | ||
return err | ||
} | ||
|
||
// We are going backwards since we create the root of the directory first | ||
// and then create the entire nested structure. | ||
for i := len(filePerms) - 1; i >= 0; i-- { | ||
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. Comment why you are going backwards |
||
fi := filePerms[i] | ||
destDir := filepath.Join(basePath, fi.Name) | ||
if err := os.MkdirAll(destDir, fi.Perm); err != nil { | ||
return err | ||
} | ||
} | ||
return nil | ||
} | ||
|
||
// fileInfo holds the path and the permissions of a file | ||
type fileInfo struct { | ||
Name string | ||
Perm os.FileMode | ||
} | ||
|
||
// splitPath stats each subdirectory of a path. The first element of the array | ||
// is the file passed to this method, and the last element is the root of the | ||
// path. | ||
func (d *AllocDir) splitPath(path string) ([]fileInfo, error) { | ||
var mode os.FileMode | ||
i, err := os.Stat(path) | ||
|
||
// If the path is not present in the host then we respond with the most | ||
// flexible permission. | ||
if err != nil { | ||
mode = os.ModePerm | ||
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. Comment what this is doing |
||
} else { | ||
mode = i.Mode() | ||
} | ||
var dirs []fileInfo | ||
dirs = append(dirs, fileInfo{Name: path, Perm: mode}) | ||
currentDir := path | ||
for { | ||
dir := filepath.Dir(filepath.Clean(currentDir)) | ||
if dir == currentDir { | ||
break | ||
} | ||
|
||
// We try to find the permission of the file in the host. If the path is not | ||
// present in the host then we respond with the most flexible permission. | ||
i, err = os.Stat(dir) | ||
if err != nil { | ||
mode = os.ModePerm | ||
} else { | ||
mode = i.Mode() | ||
} | ||
dirs = append(dirs, fileInfo{Name: dir, Perm: mode}) | ||
currentDir = dir | ||
} | ||
return dirs, nil | ||
} |
This file contains 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.
Can you move the comment above or leave a blank line in-between