Fix build cache false positives when build context tar contains unnormalized paths

If a build context tar has path names of the form 'x/./y', they will be
stored in this unnormalized form internally by tarsum. When the builder
walks the untarred directory tree and queries hashes for each relative
path, it will query paths of the form 'x/y', and they will not be found.

To correct this, have tarsum normalize path names by calling Clean.

Add a test to detect this caching false positive.

Fixes #21715

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
This commit is contained in:
Aaron Lehmann 2016-04-01 10:49:04 -07:00
parent d70faf86e8
commit a842fba285

View file

@ -28,6 +28,7 @@ import (
"fmt" "fmt"
"hash" "hash"
"io" "io"
"path"
"strings" "strings"
) )
@ -235,7 +236,7 @@ func (ts *tarSum) Read(buf []byte) (int, error) {
} }
return n, err return n, err
} }
ts.currentFile = strings.TrimSuffix(strings.TrimPrefix(currentHeader.Name, "./"), "/") ts.currentFile = path.Clean(currentHeader.Name)
if err := ts.encodeHeader(currentHeader); err != nil { if err := ts.encodeHeader(currentHeader); err != nil {
return 0, err return 0, err
} }