Skip to content

fix MkdirAll usage #2361

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.

Sign up for GitHub

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

Closed
kolyshkin wants to merge 3 commits into from
Closed

fix MkdirAll usage #2361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
baf2849
fix MkdirAll usage
kolyshkin May 16, 2020
d7928ae
(*Builder).Run: MkdirAll: handle EEXIST error
kolyshkin Jun 11, 2020
1486ed6
Merge branch 'master' into mkdirAll
rhatdan Oct 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/secrets/secrets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ type secretData struct {
// saveTo saves secret data to given directory
func (s secretData) saveTo(dir string) error {
path := filepath.Join(dir, s.name)
if err := os.MkdirAll(filepath.Dir(path), s.dirMode); err != nil && !os.IsExist(err) {
if err := os.MkdirAll(filepath.Dir(path), s.dirMode); err != nil {
return err
}
return ioutil.WriteFile(path, s.data, s.mode)
Expand Down
27 changes: 23 additions & 4 deletions run_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,28 @@ func (b *Builder) Run(command []string, options RunOptions) error {
spec := g.Config
g = nil

logrus.Debugf("ensuring working directory %q exists", filepath.Join(mountPoint, spec.Process.Cwd))
if err = os.MkdirAll(filepath.Join(mountPoint, spec.Process.Cwd), 0755); err != nil && !os.IsExist(err) {
return errors.Wrapf(err, "error ensuring working directory %q exists", spec.Process.Cwd)
wd := filepath.Join(mountPoint, spec.Process.Cwd)
logrus.Debugf("ensuring working directory %q exists", wd)
if err = os.MkdirAll(wd, 0755); err != nil {
ensureErr := errors.Wrapf(err, "error ensuring working directory %q exists", spec.Process.Cwd)
// Ignore the error in case wd exists and it is an absolute symlink
// to a directory that exists inside a container.
if !os.IsExist(err) {
return ensureErr
}
link, err := os.Readlink(wd)
if err != nil { // not a symlink
return ensureErr
}
if !strings.HasPrefix(link, "/") {
// relative symlink should have been resolved by MkdirAll
return ensureErr
}
st, err := os.Stat(filepath.Join(mountPoint, link))
if err != nil || !st.IsDir() {
return ensureErr
}
// ignore the error since wd is resolvable under container root.
}

// Set the seccomp configuration using the specified profile name. Some syscalls are
Expand Down Expand Up @@ -213,7 +232,7 @@ func (b *Builder) Run(command []string, options RunOptions) error {
if _, ok := bindFiles["/run/.containerenv"]; !ok {
// Empty string for now, but we may consider populating this later
containerenvPath := filepath.Join(path, "/run/.containerenv")
if err = os.MkdirAll(filepath.Dir(containerenvPath), 0755); err != nil && !os.IsExist(err) {
if err = os.MkdirAll(filepath.Dir(containerenvPath), 0755); err != nil {
return err
}
emptyFile, err := os.Create(containerenvPath)
Expand Down