kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

pkg/symlink: don't depend on pkg/system and pkg/longpath

Browse source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2020-03-09 16:41:54 +01:00
parent 6004b9ad52
commit a48c6e3005
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
3 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/symlink/fs.go
View file

@ -12,8 +12,6 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/docker/docker/pkg/system"
) )
// FollowSymlinkInScope is a wrapper around evalSymlinksInScope that returns an // FollowSymlinkInScope is a wrapper around evalSymlinksInScope that returns an
@ -123,7 +121,7 @@ func evalSymlinksInScope(path, root string) (string, error) {
if err != nil { if err != nil {
return "", err return "", err
} }
if system.IsAbs(dest) { if isAbs(dest) {
b.Reset() b.Reset()
} }
path = dest + string(filepath.Separator) + path path = dest + string(filepath.Separator) + path

2
pkg/symlink/fs_unix.go
View file

@ -13,3 +13,5 @@ func evalSymlinks(path string) (string, error) {
func isDriveOrRoot(p string) bool { func isDriveOrRoot(p string) bool {
return p == string(filepath.Separator) return p == string(filepath.Separator)
} }
var isAbs = filepath.IsAbs

28
pkg/symlink/fs_windows.go
View file

@ -7,7 +7,6 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"github.com/docker/docker/pkg/longpath"
"golang.org/x/sys/windows" "golang.org/x/sys/windows"
) )
@ -77,7 +76,10 @@ func evalSymlinks(path string) (string, error) {
return filepath.Clean(p), nil return filepath.Clean(p), nil
} }
const utf8RuneSelf = 0x80 const (
utf8RuneSelf = 0x80
longPathPrefix = `\\?\`
)
func walkSymlinks(path string) (string, error) { func walkSymlinks(path string) (string, error) {
const maxIter = 255 const maxIter = 255
@ -92,8 +94,8 @@ func walkSymlinks(path string) (string, error) {
// A path beginning with `\\?\` represents the root, so automatically // A path beginning with `\\?\` represents the root, so automatically
// skip that part and begin processing the next segment. // skip that part and begin processing the next segment.
if strings.HasPrefix(path, longpath.Prefix) { if strings.HasPrefix(path, longPathPrefix) {
b.WriteString(longpath.Prefix) b.WriteString(longPathPrefix)
path = path[4:] path = path[4:]
continue continue
} }
@ -123,7 +125,7 @@ func walkSymlinks(path string) (string, error) {
// If this is the first segment after the long path prefix, accept the // If this is the first segment after the long path prefix, accept the
// current segment as a volume root or UNC share and move on to the next. // current segment as a volume root or UNC share and move on to the next.
if b.String() == longpath.Prefix { if b.String() == longPathPrefix {
b.WriteString(p) b.WriteString(p)
b.WriteRune(filepath.Separator) b.WriteRune(filepath.Separator)
continue continue
@ -146,7 +148,7 @@ func walkSymlinks(path string) (string, error) {
if err != nil { if err != nil {
return "", err return "", err
} }
if filepath.IsAbs(dest) || os.IsPathSeparator(dest[0]) { if isAbs(dest) {
b.Reset() b.Reset()
} }
path = dest + string(filepath.Separator) + path path = dest + string(filepath.Separator) + path
@ -167,3 +169,17 @@ func isDriveOrRoot(p string) bool {
} }
return false return false
} }
// isAbs is a platform-specific wrapper for filepath.IsAbs. On Windows,
// golang filepath.IsAbs does not consider a path \windows\system32 as absolute
// as it doesn't start with a drive-letter/colon combination. However, in
// docker we need to verify things such as WORKDIR /windows/system32 in
// a Dockerfile (which gets translated to \windows\system32 when being processed
// by the daemon. This SHOULD be treated as absolute from a docker processing
// perspective.
func isAbs(path string) bool {
if filepath.IsAbs(path) || strings.HasPrefix(path, string(os.PathSeparator)) {
return true
}
return false
}