ae8c004dc1
This fixes errors in ownership on directory creation during build that can cause inaccessible files depending on the paths in the Dockerfile and non-existing directories in the starting image. Add tests for the mkdir variants in pkg/idtools Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
60 lines
1.7 KiB
Go
60 lines
1.7 KiB
Go
// +build !windows
|
|
|
|
package idtools
|
|
|
|
import (
|
|
"os"
|
|
"path/filepath"
|
|
|
|
"github.com/docker/docker/pkg/system"
|
|
)
|
|
|
|
func mkdirAs(path string, mode os.FileMode, ownerUID, ownerGID int, mkAll, chownExisting bool) error {
|
|
// make an array containing the original path asked for, plus (for mkAll == true)
|
|
// all path components leading up to the complete path that don't exist before we MkdirAll
|
|
// so that we can chown all of them properly at the end. If chownExisting is false, we won't
|
|
// chown the full directory path if it exists
|
|
var paths []string
|
|
if _, err := os.Stat(path); err != nil && os.IsNotExist(err) {
|
|
paths = []string{path}
|
|
} else if err == nil && chownExisting {
|
|
if err := os.Chown(path, ownerUID, ownerGID); err != nil {
|
|
return err
|
|
}
|
|
// short-circuit--we were called with an existing directory and chown was requested
|
|
return nil
|
|
} else if err == nil {
|
|
// nothing to do; directory path fully exists already and chown was NOT requested
|
|
return nil
|
|
}
|
|
|
|
if mkAll {
|
|
// walk back to "/" looking for directories which do not exist
|
|
// and add them to the paths array for chown after creation
|
|
dirPath := path
|
|
for {
|
|
dirPath = filepath.Dir(dirPath)
|
|
if dirPath == "/" {
|
|
break
|
|
}
|
|
if _, err := os.Stat(dirPath); err != nil && os.IsNotExist(err) {
|
|
paths = append(paths, dirPath)
|
|
}
|
|
}
|
|
if err := system.MkdirAll(path, mode); err != nil && !os.IsExist(err) {
|
|
return err
|
|
}
|
|
} else {
|
|
if err := os.Mkdir(path, mode); err != nil && !os.IsExist(err) {
|
|
return err
|
|
}
|
|
}
|
|
// even if it existed, we will chown the requested path + any subpaths that
|
|
// didn't exist when we called MkdirAll
|
|
for _, pathComponent := range paths {
|
|
if err := os.Chown(pathComponent, ownerUID, ownerGID); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
}
|