Stop ADD from following symlinks outside the context when passed as t…

…he first argument Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
moby · Jan 11, 2014 · fb63cfa · fb63cfa
1 parent cb314b9
commit fb63cfa
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/buildfile.go b/buildfile.go
@@ -287,6 +287,11 @@ func (b *buildFile) CmdVolume(args string) error {
 
 func (b *buildFile) checkPathForAddition(orig string) error {
 	origPath := path.Join(b.contextPath, orig)
+	if p, err := filepath.EvalSymlinks(origPath); err != nil {
+		return err
+	} else {
+		origPath = p
+	}
 	if !strings.HasPrefix(origPath, b.contextPath) {
 		return fmt.Errorf("Forbidden path outside the build context: %s (%s)", orig, origPath)
 	}