X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1012f12d29be01b56f2bbbe2e9bd5969d69f7b89..4dda5d7b0ea74103c07617cc2ab9e5c97682c85d:/sdk/go/arvados/fs_project_test.go?ds=sidebyside

diff --git a/sdk/go/arvados/fs_project_test.go b/sdk/go/arvados/fs_project_test.go
index 1de07142fd..058eb40861 100644
--- a/sdk/go/arvados/fs_project_test.go
+++ b/sdk/go/arvados/fs_project_test.go
@@ -9,7 +9,10 @@ import (
 	"encoding/json"
 	"io"
 	"os"
+	"path/filepath"
+	"strings"
 
+	"git.curoverse.com/arvados.git/sdk/go/arvadostest"
 	check "gopkg.in/check.v1"
 )
 
@@ -37,8 +40,17 @@ func (sc *spyingClient) RequestAndDecode(dst interface{}, method, path string, b
 	return sc.Client.RequestAndDecode(dst, method, path, body, params)
 }
 
-func (s *SiteFSSuite) TestHomeProject(c *check.C) {
-	f, err := s.fs.Open("/home")
+func (s *SiteFSSuite) TestCurrentUserHome(c *check.C) {
+	s.fs.MountProject("home", "")
+	s.testHomeProject(c, "/home")
+}
+
+func (s *SiteFSSuite) TestUsersDir(c *check.C) {
+	s.testHomeProject(c, "/users/active")
+}
+
+func (s *SiteFSSuite) testHomeProject(c *check.C, path string) {
+	f, err := s.fs.Open(path)
 	c.Assert(err, check.IsNil)
 	fis, err := f.Readdir(-1)
 	c.Check(len(fis), check.Not(check.Equals), 0)
@@ -46,29 +58,30 @@ func (s *SiteFSSuite) TestHomeProject(c *check.C) {
 	ok := false
 	for _, fi := range fis {
 		c.Check(fi.Name(), check.Not(check.Equals), "")
-		if fi.Name() == "Unrestricted public data" {
+		if fi.Name() == "A Project" {
 			ok = true
 		}
 	}
 	c.Check(ok, check.Equals, true)
 
-	f, err = s.fs.Open("/home/Unrestricted public data/..")
+	f, err = s.fs.Open(path + "/A Project/..")
 	c.Assert(err, check.IsNil)
 	fi, err := f.Stat()
 	c.Check(err, check.IsNil)
 	c.Check(fi.IsDir(), check.Equals, true)
-	c.Check(fi.Name(), check.Equals, "home")
+	_, basename := filepath.Split(path)
+	c.Check(fi.Name(), check.Equals, basename)
 
-	f, err = s.fs.Open("/home/Unrestricted public data/Subproject in anonymous accessible project")
+	f, err = s.fs.Open(path + "/A Project/A Subproject")
 	c.Check(err, check.IsNil)
 	fi, err = f.Stat()
 	c.Check(err, check.IsNil)
 	c.Check(fi.IsDir(), check.Equals, true)
 
 	for _, nx := range []string{
-		"/home/A Project",
-		"/home/A Project/does not exist",
-		"/home/Unrestricted public data/does not exist",
+		path + "/Unrestricted public data",
+		path + "/Unrestricted public data/does not exist",
+		path + "/A Project/does not exist",
 	} {
 		c.Log(nx)
 		f, err = s.fs.Open(nx)
@@ -76,3 +89,84 @@ func (s *SiteFSSuite) TestHomeProject(c *check.C) {
 		c.Check(os.IsNotExist(err), check.Equals, true)
 	}
 }
+
+func (s *SiteFSSuite) TestSlashInName(c *check.C) {
+	badCollection := Collection{
+		Name:      "bad/collection",
+		OwnerUUID: arvadostest.AProjectUUID,
+	}
+	err := s.client.RequestAndDecode(&badCollection, "POST", "arvados/v1/collections", s.client.UpdateBody(&badCollection), nil)
+	c.Assert(err, check.IsNil)
+	defer s.client.RequestAndDecode(nil, "DELETE", "arvados/v1/collections/"+badCollection.UUID, nil, nil)
+
+	badProject := Group{
+		Name:       "bad/project",
+		GroupClass: "project",
+		OwnerUUID:  arvadostest.AProjectUUID,
+	}
+	err = s.client.RequestAndDecode(&badProject, "POST", "arvados/v1/groups", s.client.UpdateBody(&badProject), nil)
+	c.Assert(err, check.IsNil)
+	defer s.client.RequestAndDecode(nil, "DELETE", "arvados/v1/groups/"+badProject.UUID, nil, nil)
+
+	dir, err := s.fs.Open("/users/active/A Project")
+	c.Check(err, check.IsNil)
+	fis, err := dir.Readdir(-1)
+	c.Check(err, check.IsNil)
+	for _, fi := range fis {
+		c.Logf("fi.Name() == %q", fi.Name())
+		c.Check(strings.Contains(fi.Name(), "/"), check.Equals, false)
+	}
+}
+
+func (s *SiteFSSuite) TestProjectUpdatedByOther(c *check.C) {
+	s.fs.MountProject("home", "")
+
+	project, err := s.fs.OpenFile("/home/A Project", 0, 0)
+	c.Check(err, check.IsNil)
+
+	_, err = s.fs.Open("/home/A Project/oob")
+	c.Check(err, check.NotNil)
+
+	oob := Collection{
+		Name:      "oob",
+		OwnerUUID: arvadostest.AProjectUUID,
+	}
+	err = s.client.RequestAndDecode(&oob, "POST", "arvados/v1/collections", s.client.UpdateBody(&oob), nil)
+	c.Assert(err, check.IsNil)
+	defer s.client.RequestAndDecode(nil, "DELETE", "arvados/v1/collections/"+oob.UUID, nil, nil)
+
+	err = project.Sync()
+	c.Check(err, check.IsNil)
+	f, err := s.fs.Open("/home/A Project/oob")
+	c.Assert(err, check.IsNil)
+	fi, err := f.Stat()
+	c.Check(fi.IsDir(), check.Equals, true)
+	f.Close()
+
+	wf, err := s.fs.OpenFile("/home/A Project/oob/test.txt", os.O_CREATE|os.O_RDWR, 0700)
+	c.Assert(err, check.IsNil)
+	_, err = wf.Write([]byte("hello oob\n"))
+	c.Check(err, check.IsNil)
+	err = wf.Close()
+	c.Check(err, check.IsNil)
+
+	// Delete test.txt behind s.fs's back by updating the
+	// collection record with the old (empty) ManifestText.
+	err = s.client.RequestAndDecode(nil, "PATCH", "arvados/v1/collections/"+oob.UUID, s.client.UpdateBody(&oob), nil)
+	c.Assert(err, check.IsNil)
+
+	err = project.Sync()
+	c.Check(err, check.IsNil)
+	_, err = s.fs.Open("/home/A Project/oob/test.txt")
+	c.Check(err, check.NotNil)
+	_, err = s.fs.Open("/home/A Project/oob")
+	c.Check(err, check.IsNil)
+
+	err = s.client.RequestAndDecode(nil, "DELETE", "arvados/v1/collections/"+oob.UUID, nil, nil)
+	c.Assert(err, check.IsNil)
+
+	err = project.Sync()
+	c.Check(err, check.IsNil)
+	_, err = s.fs.Open("/home/A Project/oob")
+	c.Check(err, check.NotNil)
+}