vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Change path breakout detection logic in archive package

Browse source 
Fixes #9375

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>

Conflicts:
	integration-cli/docker_cli_cp_test.go
		removed extra test
This commit is contained in:
Alexandr Morozov 2014-11-26 23:00:13 -08:00 • committed by unclejack
parent cd74be68b8
commit 5ce91364b3
2 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
archive/archive.go
View file

@ -473,10 +473,13 @@ loop:
} }
} }
// Prevent symlink breakout
path := filepath.Join(dest, hdr.Name) path := filepath.Join(dest, hdr.Name)
if !strings.HasPrefix(path, dest) { rel, err := filepath.Rel(dest, path)
return breakoutError(fmt.Errorf("%q is outside of %q", path, dest)) if err != nil {
return err
}
if strings.HasPrefix(rel, "..") {
return breakoutError(fmt.Errorf("%q is outside of %q", hdr.Name, dest))
} }
// If path exits we almost always just want to remove and replace it // If path exits we almost always just want to remove and replace it

12
archive/diff.go
View file

@ -81,12 +81,14 @@ func UnpackLayer(dest string, layer ArchiveReader) error {
} }
path := filepath.Join(dest, hdr.Name) path := filepath.Join(dest, hdr.Name)
base := filepath.Base(path) rel, err := filepath.Rel(dest, path)
if err != nil {
// Prevent symlink breakout return err
if !strings.HasPrefix(path, dest) {
return breakoutError(fmt.Errorf("%q is outside of %q", path, dest))
} }
if strings.HasPrefix(rel, "..") {
return breakoutError(fmt.Errorf("%q is outside of %q", hdr.Name, dest))
}
base := filepath.Base(path)
if strings.HasPrefix(base, ".wh.") { if strings.HasPrefix(base, ".wh.") {
originalBase := base[len(".wh."):] originalBase := base[len(".wh."):]