зеркало из https://github.com/microsoft/docker.git
Improve ValidateContextDirectory error handling.
- Errors sent to the walker callback functions were ignored. This meant that one could get a panic when calling methods on a nil FileInfo object. For example when the file did not exists any more. - Lstat calls inside walker callback are reduntant because walker already calls Lstat and passes the result to the callback. - Error returned from filepath.Rel() can never be EACCES because it compares strings and does not care about actual files. - If Matched() returns error then ValidateContextDirectory() must return error. Currently it still kept walking although the outcome was already known. - Function will now fail in case of unknown error(not EACCES nor ENOENT). Previous implementation did not make a clear decision about this (but panicked because of the issues above). Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)
This commit is contained in:
Родитель
23f490427f
Коммит
a8914293fb
|
@ -523,48 +523,44 @@ func TreeSize(dir string) (size int64, err error) {
|
|||
// can be read and returns an error if some files can't be read
|
||||
// symlinks which point to non-existing files don't trigger an error
|
||||
func ValidateContextDirectory(srcPath string, excludes []string) error {
|
||||
var finalError error
|
||||
|
||||
filepath.Walk(filepath.Join(srcPath, "."), func(filePath string, f os.FileInfo, err error) error {
|
||||
return filepath.Walk(filepath.Join(srcPath, "."), func(filePath string, f os.FileInfo, err error) error {
|
||||
// skip this directory/file if it's not in the path, it won't get added to the context
|
||||
relFilePath, err := filepath.Rel(srcPath, filePath)
|
||||
if err != nil && os.IsPermission(err) {
|
||||
return nil
|
||||
}
|
||||
|
||||
skip, err := Matches(relFilePath, excludes)
|
||||
if err != nil {
|
||||
finalError = err
|
||||
}
|
||||
if skip {
|
||||
if relFilePath, err := filepath.Rel(srcPath, filePath); err != nil {
|
||||
return err
|
||||
} else if skip, err := Matches(relFilePath, excludes); err != nil {
|
||||
return err
|
||||
} else if skip {
|
||||
if f.IsDir() {
|
||||
return filepath.SkipDir
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
if _, err := os.Stat(filePath); err != nil && os.IsPermission(err) {
|
||||
finalError = fmt.Errorf("can't stat '%s'", filePath)
|
||||
if err != nil {
|
||||
if os.IsPermission(err) {
|
||||
return fmt.Errorf("can't stat '%s'", filePath)
|
||||
}
|
||||
if os.IsNotExist(err) {
|
||||
return nil
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
// skip checking if symlinks point to non-existing files, such symlinks can be useful
|
||||
// also skip named pipes, because they hanging on open
|
||||
lstat, _ := os.Lstat(filePath)
|
||||
if lstat != nil && lstat.Mode()&(os.ModeSymlink|os.ModeNamedPipe) != 0 {
|
||||
if f.Mode()&(os.ModeSymlink|os.ModeNamedPipe) != 0 {
|
||||
return nil
|
||||
}
|
||||
|
||||
if !f.IsDir() {
|
||||
currentFile, err := os.Open(filePath)
|
||||
if err != nil && os.IsPermission(err) {
|
||||
finalError = fmt.Errorf("no permission to read from '%s'", filePath)
|
||||
return err
|
||||
return fmt.Errorf("no permission to read from '%s'", filePath)
|
||||
}
|
||||
currentFile.Close()
|
||||
}
|
||||
return nil
|
||||
})
|
||||
return finalError
|
||||
}
|
||||
|
||||
func StringsContainsNoCase(slice []string, s string) bool {
|
||||
|
|
Загрузка…
Ссылка в новой задаче