X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/8f1554cf9cfc279e0127d7ea2c7a79a98e323f13..e8dd6d95b4ab40e6f95b0faa51752599e27f6baf:/services/fuse/tests/test_mount.py diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py index 256f820619..29b237d148 100644 --- a/services/fuse/tests/test_mount.py +++ b/services/fuse/tests/test_mount.py @@ -67,9 +67,35 @@ class FuseMountTest(MountTestBase): cw.start_new_file('thing8.txt') cw.write("data 8") + cw.start_new_stream('edgecases') + for f in ":/./../.../-/*/\x01\\/ ".split("/"): + cw.start_new_file(f) + cw.write('x') + + for f in ":/../.../-/*/\x01\\/ ".split("/"): + cw.start_new_stream('edgecases/dirs/' + f) + cw.start_new_file('x/x') + cw.write('x') + + self._utf8 = ["\xe2\x9c\x8c", # victory sign + "\xe2\x9b\xb5", # sailboat + # "\xf0\x9f\x98\xb1", # scream. doesn't work!! + ] + cw.start_new_stream('edgecases/utf8') + for f in self._utf8: + cw.start_new_file(f) + cw.write(f) + self.testcollection = cw.finish() self.api.collections().create(body={"manifest_text":cw.manifest_text()}).execute() + def assertDirContents(self, subdir, expect_content): + path = self.mounttmp + if subdir: + path = os.path.join(path, subdir) + self.assertEqual(sorted([fn.decode('utf-8') for fn in expect_content]), + sorted([fn.decode('utf-8') for fn in os.listdir(path)])) + def runTest(self): # Create the request handler operations = fuse.Operations(os.getuid(), os.getgid()) @@ -83,21 +109,16 @@ class FuseMountTest(MountTestBase): operations.initlock.wait() # now check some stuff - d1 = os.listdir(self.mounttmp) - d1.sort() - self.assertEqual(['dir1', 'dir2', 'thing1.txt', 'thing2.txt'], d1) - - d2 = os.listdir(os.path.join(self.mounttmp, 'dir1')) - d2.sort() - self.assertEqual(['thing3.txt', 'thing4.txt'], d2) - - d3 = os.listdir(os.path.join(self.mounttmp, 'dir2')) - d3.sort() - self.assertEqual(['dir3', 'thing5.txt', 'thing6.txt'], d3) - - d4 = os.listdir(os.path.join(self.mounttmp, 'dir2/dir3')) - d4.sort() - self.assertEqual(['thing7.txt', 'thing8.txt'], d4) + self.assertDirContents(None, ['thing1.txt', 'thing2.txt', + 'edgecases', 'dir1', 'dir2']) + self.assertDirContents('dir1', ['thing3.txt', 'thing4.txt']) + self.assertDirContents('dir2', ['thing5.txt', 'thing6.txt', 'dir3']) + self.assertDirContents('dir2/dir3', ['thing7.txt', 'thing8.txt']) + self.assertDirContents('edgecases', + "dirs/utf8/:/_/__/.../-/*/\x01\\/ ".split("/")) + self.assertDirContents('edgecases/dirs', + ":/__/.../-/*/\x01\\/ ".split("/")) + self.assertDirContents('edgecases/utf8', self._utf8) files = {'thing1.txt': 'data 1', 'thing2.txt': 'data 2', @@ -250,37 +271,42 @@ class FuseSharedTest(MountTestBase): # wait until the driver is finished initializing operations.initlock.wait() - d1 = os.listdir(self.mounttmp) - d1.sort() - self.assertIn('Active User', d1) - - d2 = os.listdir(os.path.join(self.mounttmp, 'Active User')) - d2.sort() - self.assertEqual(['A Project', - "Empty collection", - "Empty collection.link", - "Pipeline Template with Input Parameter with Search.pipelineTemplate", - "Pipeline Template with Jobspec Components.pipelineTemplate", - "collection_expires_in_future", - "collection_with_same_name_in_aproject_and_home_project", - "owned_by_active", - "pipeline_to_merge_params.pipelineInstance", - "pipeline_with_job.pipelineInstance", - "pipeline_with_tagged_collection_input.pipelineInstance" - ], d2) - - d3 = os.listdir(os.path.join(self.mounttmp, 'Active User', 'A Project')) - d3.sort() - self.assertEqual(["A Subproject", - "Two Part Pipeline Template.pipelineTemplate", - "collection_to_move_around", - "collection_with_same_name_in_aproject_and_home_project", - "zzzzz-4zz18-fy296fx3hot09f7 added sometime" - ], d3) - - with open(os.path.join(self.mounttmp, 'Active User', "A Project", "Two Part Pipeline Template.pipelineTemplate")) as f: + # shared_dirs is a list of the directories exposed + # by fuse.SharedDirectory (i.e. any object visible + # to the current user) + shared_dirs = os.listdir(self.mounttmp) + shared_dirs.sort() + self.assertIn('FUSE User', shared_dirs) + + # fuse_user_objs is a list of the objects owned by the FUSE + # test user (which present as files in the 'FUSE User' + # directory) + fuse_user_objs = os.listdir(os.path.join(self.mounttmp, 'FUSE User')) + fuse_user_objs.sort() + self.assertEqual(['Empty collection.link', # permission link on collection + 'FUSE Test Project', # project owned by user + 'collection #1 owned by FUSE', # collection owned by user + 'collection #2 owned by FUSE', # collection owned by user + 'pipeline instance owned by FUSE.pipelineInstance', # pipeline instance owned by user + ], fuse_user_objs) + + # test_proj_files is a list of the files in the FUSE Test Project. + test_proj_files = os.listdir(os.path.join(self.mounttmp, 'FUSE User', 'FUSE Test Project')) + test_proj_files.sort() + self.assertEqual(['collection in FUSE project', + 'pipeline instance in FUSE project.pipelineInstance', + 'pipeline template in FUSE project.pipelineTemplate' + ], test_proj_files) + + # Double check that we can open and read objects in this folder as a file, + # and that its contents are what we expect. + with open(os.path.join( + self.mounttmp, + 'FUSE User', + 'FUSE Test Project', + 'pipeline template in FUSE project.pipelineTemplate')) as f: j = json.load(f) - self.assertEqual("Two Part Pipeline Template", j['name']) + self.assertEqual("pipeline template in FUSE project", j['name']) class FuseHomeTest(MountTestBase): @@ -306,3 +332,35 @@ class FuseHomeTest(MountTestBase): d3 = os.listdir(os.path.join(self.mounttmp, 'Unrestricted public data', 'GNU General Public License, version 3')) d3.sort() self.assertEqual(["GNU_General_Public_License,_version_3.pdf"], d3) + + +class FuseUnitTest(unittest.TestCase): + def test_sanitize_filename(self): + acceptable = [ + "foo.txt", + ".foo", + "..foo", + "...", + "foo...", + "foo..", + "foo.", + "-", + "\x01\x02\x03", + ] + unacceptable = [ + "f\00", + "\00\00", + "/foo", + "foo/", + "//", + ] + for f in acceptable: + self.assertEqual(f, fuse.sanitize_filename(f)) + for f in unacceptable: + self.assertNotEqual(f, fuse.sanitize_filename(f)) + # The sanitized filename should be the same length, though. + self.assertEqual(len(f), len(fuse.sanitize_filename(f))) + # Special cases + self.assertEqual("_", fuse.sanitize_filename("")) + self.assertEqual("_", fuse.sanitize_filename(".")) + self.assertEqual("__", fuse.sanitize_filename(".."))