fix: fix recursive symlinks

Author: FabianKramm

helper/server/downstream.go

@@ -5,6 +5,7 @@ import (
 	"compress/gzip"
 	"context"
 	"github.com/loft-sh/devspace/helper/util/pingtimeout"
+	"github.com/loft-sh/devspace/pkg/util/fsutil"
 	logpkg "github.com/loft-sh/devspace/pkg/util/log"
 	"io"
 	"io/ioutil"
@@ -526,6 +527,9 @@ func walkDir(basePath string, path string, ignoreMatcher ignoreparser.IgnorePars
 
 	for _, f := range files {
 		absolutePath := filepath.Join(path, f.Name())
+		if fsutil.IsRecursiveSymlink(f, absolutePath) {
+			continue
+		}
 
 		// Stat is necessary here, because readdir does not follow symlinks and
 		// IsDir() returns false for symlinked folders

helper/server/tar.go

@@ -3,6 +3,7 @@ package server
 import (
 	"archive/tar"
 	"compress/gzip"
+	"github.com/loft-sh/devspace/pkg/util/fsutil"
 	"io"
 	"io/ioutil"
 	"os"
@@ -213,6 +214,10 @@ func tarFolder(basePath string, fileInformation *fileInformation, writtenFiles m
 
 	if !skipContents {
 		for _, f := range files {
+			if fsutil.IsRecursiveSymlink(f, path.Join(fileInformation.Name, f.Name())) {
+				continue
+			}
+
 			if err := recursiveTar(basePath, path.Join(fileInformation.Name, f.Name()), writtenFiles, tw, skipContents); err != nil {
 				return errors.Wrap(err, "recursive tar")
 			}

helper/server/upstream.go

@@ -8,6 +8,7 @@ import (
 	"github.com/loft-sh/devspace/helper/util/crc32"
 	"github.com/loft-sh/devspace/helper/util/pingtimeout"
 	"github.com/loft-sh/devspace/helper/util/stderrlog"
+	"github.com/loft-sh/devspace/pkg/util/fsutil"
 	logpkg "github.com/loft-sh/devspace/pkg/util/log"
 	"github.com/pkg/errors"
 	"google.golang.org/grpc"
@@ -191,6 +192,9 @@ func (u *Upstream) removeRecursive(absolutePath string) error {
 	// Loop over directory contents and check if we should delete the contents
 	for _, f := range files {
 		absoluteChildPath := filepath.Join(absolutePath, f.Name())
+		if fsutil.IsRecursiveSymlink(f, absoluteChildPath) {
+			continue
+		}
 
 		// Check if ignored
 		if u.ignoreMatcher != nil && !u.ignoreMatcher.RequireFullScan() && u.ignoreMatcher.Matches(absolutePath[len(u.options.UploadPath):], f.IsDir()) {

pkg/devspace/hook/upload.go

@@ -3,6 +3,7 @@ package hook
 import (
 	"archive/tar"
 	"compress/gzip"
+	"github.com/loft-sh/devspace/pkg/util/fsutil"
 	"io"
 	"io/ioutil"
 	"os"
@@ -129,6 +130,10 @@ func recursiveTar(srcBase, srcFile, destBase, destFile string, tw *tar.Writer) e
 				}
 			}
 			for _, f := range files {
+				if fsutil.IsRecursiveSymlink(f, path.Join(fpath, f.Name())) {
+					continue
+				}
+
 				if err := recursiveTar(srcBase, path.Join(srcFile, f.Name()), destBase, path.Join(destFile, f.Name()), tw); err != nil {
 					return err
 				}

pkg/devspace/sync/downstream.go

@@ -3,9 +3,11 @@ package sync
 import (
 	"context"
 	"fmt"
+	"github.com/loft-sh/devspace/pkg/util/fsutil"
 	"io"
 	"io/ioutil"
 	"os"
+	"path"
 	"path/filepath"
 	"strings"
 	"time"
@@ -437,6 +439,10 @@ func (d *downstream) deleteSafeRecursive(relativePath string, deleteChanges []*r
 
 	// Loop over directory contents and check if we should delete the contents
 	for _, f := range files {
+		if fsutil.IsRecursiveSymlink(f, path.Join(relativePath, f.Name())) {
+			continue
+		}
+
 		childRelativePath := filepath.ToSlash(filepath.Join(relativePath, f.Name()))
 		childAbsFilepath := filepath.Join(d.sync.LocalPath, childRelativePath)
 		if shouldRemoveLocal(childAbsFilepath, d.sync.fileIndex.fileMap[childRelativePath], d.sync, force) {

pkg/devspace/sync/initial.go

@@ -2,6 +2,7 @@ package sync
 
 import (
 	"github.com/loft-sh/devspace/helper/server/ignoreparser"
+	"github.com/loft-sh/devspace/pkg/util/fsutil"
 	"io/ioutil"
 	"os"
 	"path"
@@ -356,6 +357,11 @@ func (i *initialSyncer) calculateLocalDirState(absPath string, stat os.FileInfo,
 	}
 
 	for _, f := range files {
+		if fsutil.IsRecursiveSymlink(f, filepath.Join(absPath, f.Name())) {
+			i.o.Log.Debugf("Found recursive symlink at %v", filepath.Join(absPath, f.Name()))
+			continue
+		}
+
 		err := i.CalculateLocalState(filepath.Join(absPath, f.Name()), localState, ignore)
 		if err != nil {
 			return errors.Wrap(err, f.Name())

pkg/devspace/sync/tar.go

@@ -3,6 +3,7 @@ package sync
 import (
 	"archive/tar"
 	"compress/gzip"
+	"github.com/loft-sh/devspace/pkg/util/fsutil"
 	"io"
 	"io/ioutil"
 	"os"
@@ -283,8 +284,8 @@ func (a *Archiver) AddToArchive(relativePath string) error {
 }
 
 func (a *Archiver) tarFolder(target *FileInformation, targetStat os.FileInfo) error {
-	filepath := path.Join(a.basePath, target.Name)
-	files, err := ioutil.ReadDir(filepath)
+	filePath := path.Join(a.basePath, target.Name)
+	files, err := ioutil.ReadDir(filePath)
 	if err != nil {
 		// config.Logf("[Upstream] Couldn't read dir %s: %s\n", filepath, err.Error())
 		return nil
@@ -294,7 +295,7 @@ func (a *Archiver) tarFolder(target *FileInformation, targetStat os.FileInfo) er
 		// check if not excluded
 		if a.ignoreMatcher == nil || !a.ignoreMatcher.RequireFullScan() || !a.ignoreMatcher.Matches(target.Name, true) {
 			// Case empty directory
-			hdr, _ := tar.FileInfoHeader(targetStat, filepath)
+			hdr, _ := tar.FileInfoHeader(targetStat, filePath)
 			hdr.Uid = 0
 			hdr.Gid = 0
 			hdr.Mode = fillGo18FileTypeBits(int64(chmodTarEntry(os.FileMode(hdr.Mode))), targetStat)
@@ -308,6 +309,10 @@ func (a *Archiver) tarFolder(target *FileInformation, targetStat os.FileInfo) er
 	}
 
 	for _, f := range files {
+		if fsutil.IsRecursiveSymlink(f, path.Join(filePath, f.Name())) {
+			continue
+		}
+
 		if err := a.AddToArchive(path.Join(target.Name, f.Name())); err != nil {
 			return errors.Wrap(err, "recursive tar "+f.Name())
 		}
@@ -325,7 +330,7 @@ func (a *Archiver) tarFile(target *FileInformation, targetStat os.FileInfo) erro
 		}
 
 		targetStat, err = os.Stat(filepath)
-		if err != nil {
+		if err != nil || targetStat.IsDir() {
 			// We ignore open file and just treat it as okay
 			return nil
 		}

pkg/util/fsutil/filesystem.go

@@ -11,6 +11,20 @@ import (
 	recursiveCopy "github.com/otiai10/copy"
 )
 
+// IsRecursiveSymlink checks if the provided non-resolved file info
+// is a recursive symlink
+func IsRecursiveSymlink(f os.FileInfo, symlinkPath string) bool {
+	// check if recursive symlink
+	if f.Mode()&os.ModeSymlink == os.ModeSymlink {
+		resolvedPath, err := filepath.EvalSymlinks(symlinkPath)
+		if err != nil || strings.HasPrefix(symlinkPath, filepath.ToSlash(resolvedPath)) {
+			return true
+		}
+	}
+
+	return false
+}
+
 // WriteToFile writes data to a file
 func WriteToFile(data []byte, filePath string) error {
 	err := os.MkdirAll(filepath.Dir(filePath), 0755)