-
Notifications
You must be signed in to change notification settings - Fork 202
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #166 from rhatdan/windows
Do not validate paths on remote platforms
- Loading branch information
Showing
7 changed files
with
126 additions
and
92 deletions.
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
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
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 |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| // +build !remote | ||
|
|
||
| package config | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "os" | ||
| "path/filepath" | ||
| "syscall" | ||
|
|
||
| units "github.com/docker/go-units" | ||
| ) | ||
|
|
||
| // isDirectory tests whether the given path exists and is a directory. It | ||
| // follows symlinks. | ||
| func isDirectory(path string) error { | ||
| path, err := resolveHomeDir(path) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| info, err := os.Stat(path) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if !info.Mode().IsDir() { | ||
| // Return a PathError to be consistent with os.Stat(). | ||
| return &os.PathError{ | ||
| Op: "stat", | ||
| Path: path, | ||
| Err: syscall.ENOTDIR, | ||
| } | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func (c *EngineConfig) validatePaths() error { | ||
| // Relative paths can cause nasty bugs, because core paths we use could | ||
| // shift between runs or even parts of the program. - The OCI runtime | ||
| // uses a different working directory than we do, for example. | ||
| if c.StaticDir != "" && !filepath.IsAbs(c.StaticDir) { | ||
| return fmt.Errorf("static directory must be an absolute path - instead got %q", c.StaticDir) | ||
| } | ||
| if c.TmpDir != "" && !filepath.IsAbs(c.TmpDir) { | ||
| return fmt.Errorf("temporary directory must be an absolute path - instead got %q", c.TmpDir) | ||
| } | ||
| if c.VolumePath != "" && !filepath.IsAbs(c.VolumePath) { | ||
| return fmt.Errorf("volume path must be an absolute path - instead got %q", c.VolumePath) | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func (c *ContainersConfig) validateDevices() error { | ||
| for _, d := range c.Devices { | ||
| _, _, _, err := Device(d) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func (c *ContainersConfig) validateUlimits() error { | ||
| for _, u := range c.DefaultUlimits { | ||
| ul, err := units.ParseUlimit(u) | ||
| if err != nil { | ||
| return fmt.Errorf("unrecognized ulimit %s: %v", u, err) | ||
| } | ||
| _, err = ul.GetRlimit() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| } | ||
| return 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| // +build remote | ||
|
|
||
| package config | ||
|
|
||
| // isDirectory tests whether the given path exists and is a directory. It | ||
| // follows symlinks. | ||
| func isDirectory(path string) error { | ||
| return nil | ||
| } | ||
|
|
||
| func (c *EngineConfig) validatePaths() error { | ||
| return nil | ||
| } | ||
|
|
||
| func (c *ContainersConfig) validateDevices() error { | ||
| return nil | ||
| } | ||
|
|
||
| func (c *ContainersConfig) validateUlimits() error { | ||
| return nil | ||
| } |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
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