Merge pull request #38 from mcuadros/cross

chroot: allow Symlinks cross boundary
src-d · Jun 26, 2017 · 1801347 · 1801347
2 parents c74cbe6 + 8cde47a
commit 1801347
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 17 deletions.
diff --git a/helper/chroot/chroot.go b/helper/chroot/chroot.go
@@ -169,10 +169,6 @@ func (fs *ChrootHelper) Symlink(target, link string) error {
 		target = filepath.Clean(filepath.FromSlash(target))
 	}
 
-	if fs.isTargetOutBounders(link, target) {
-		return billy.ErrCrossedBoundary
-	}
-
 	link, err := fs.underlyingPath(link)
 	if err != nil {
 		return err
@@ -181,17 +177,6 @@ func (fs *ChrootHelper) Symlink(target, link string) error {
 	return fs.underlying.(billy.Symlink).Symlink(target, link)
 }
 
-func (fs *ChrootHelper) isTargetOutBounders(link, target string) bool {
-	fulllink := fs.Join(fs.base, link)
-	fullpath := fs.Join(filepath.Dir(fulllink), target)
-	target, err := filepath.Rel(fs.base, fullpath)
-	if err != nil {
-		return true
-	}
-
-	return isCrossBoundaries(target)
-}
-
 func (fs *ChrootHelper) Readlink(link string) (string, error) {
 	fullpath, err := fs.underlyingPath(link)
 	if err != nil {

diff --git a/test/fs.go b/test/fs.go
@@ -104,8 +104,14 @@ func (s *FilesystemSuite) TestSymlinkWithChrootBasic(c *C) {
 
 func (s *FilesystemSuite) TestSymlinkWithChrootCrossBounders(c *C) {
 	qux, _ := s.FS.Chroot("/qux")
-	err := qux.(Filesystem).Symlink("../../file", "qux/link")
-	c.Assert(err, Equals, ErrCrossedBoundary)
+	util.WriteFile(s.FS, "file", []byte("foo"), customMode)
+
+	err := qux.Symlink("../../file", "qux/link")
+	c.Assert(err, Equals, nil)
+
+	fi, err := qux.Stat("qux/link")
+	c.Assert(fi, NotNil)
+	c.Assert(err, Equals, nil)
 }
 
 func (s *FilesystemSuite) TestReadDirWithLink(c *C) {