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

thaJeztah · thaJeztah · commit a48c6e30057b · 2020-03-09T16:41:54.000+01:00
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/pkg/symlink/fs.go b/pkg/symlink/fs.go
@@ -12,8 +12,6 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
-
-	"github.com/docker/docker/pkg/system"
 )
 
 // FollowSymlinkInScope is a wrapper around evalSymlinksInScope that returns an
@@ -123,7 +121,7 @@ func evalSymlinksInScope(path, root string) (string, error) {
 		if err != nil {
 			return "", err
 		}
-		if system.IsAbs(dest) {
+		if isAbs(dest) {
 			b.Reset()
 		}
 		path = dest + string(filepath.Separator) + path
diff --git a/pkg/symlink/fs_unix.go b/pkg/symlink/fs_unix.go
@@ -13,3 +13,5 @@ func evalSymlinks(path string) (string, error) {
 func isDriveOrRoot(p string) bool {
 	return p == string(filepath.Separator)
 }
+
+var isAbs = filepath.IsAbs
diff --git a/pkg/symlink/fs_windows.go b/pkg/symlink/fs_windows.go
@@ -7,7 +7,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/docker/docker/pkg/longpath"
 	"golang.org/x/sys/windows"
 )
 
@@ -77,7 +76,10 @@ func evalSymlinks(path string) (string, error) {
 	return filepath.Clean(p), nil
 }
 
-const utf8RuneSelf = 0x80
+const (
+	utf8RuneSelf   = 0x80
+	longPathPrefix = `\\?\`
+)
 
 func walkSymlinks(path string) (string, error) {
 	const maxIter = 255
@@ -92,8 +94,8 @@ func walkSymlinks(path string) (string, error) {
 
 		// A path beginning with `\\?\` represents the root, so automatically
 		// skip that part and begin processing the next segment.
-		if strings.HasPrefix(path, longpath.Prefix) {
-			b.WriteString(longpath.Prefix)
+		if strings.HasPrefix(path, longPathPrefix) {
+			b.WriteString(longPathPrefix)
 			path = path[4:]
 			continue
 		}
@@ -123,7 +125,7 @@ func walkSymlinks(path string) (string, error) {
 
 		// 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.
-		if b.String() == longpath.Prefix {
+		if b.String() == longPathPrefix {
 			b.WriteString(p)
 			b.WriteRune(filepath.Separator)
 			continue
@@ -146,7 +148,7 @@ func walkSymlinks(path string) (string, error) {
 		if err != nil {
 			return "", err
 		}
-		if filepath.IsAbs(dest) || os.IsPathSeparator(dest[0]) {
+		if isAbs(dest) {
 			b.Reset()
 		}
 		path = dest + string(filepath.Separator) + path
@@ -167,3 +169,17 @@ func isDriveOrRoot(p string) bool {
 	}
 	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
+}

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,6 @@ import (`
`12`	`12`	`"os"`
`13`	`13`	`"path/filepath"`
`14`	`14`	`"strings"`
`15`		`-`
`16`		`- "github.com/docker/docker/pkg/system"`
`17`	`15`	`)`
`18`	`16`
`19`	`17`	`// FollowSymlinkInScope is a wrapper around evalSymlinksInScope that returns an`
`@@ -123,7 +121,7 @@ func evalSymlinksInScope(path, root string) (string, error) {`
`123`	`121`	`if err != nil {`
`124`	`122`	`return "", err`
`125`	`123`	`}`
`126`		`- if system.IsAbs(dest) {`
	`124`	`+ if isAbs(dest) {`
`127`	`125`	`b.Reset()`
`128`	`126`	`}`
`129`	`127`	`path = dest + string(filepath.Separator) + path`
Original file line number	Diff line number	Diff line change
`@@ -13,3 +13,5 @@ func evalSymlinks(path string) (string, error) {`
`13`	`13`	`func isDriveOrRoot(p string) bool {`
`14`	`14`	`return p == string(filepath.Separator)`
`15`	`15`	`}`
	`16`	`+`
	`17`	`+var isAbs = filepath.IsAbs`