Merge lp:~verterok/ubuntuone-client/fix-552818 into lp:ubuntuone-client

[Guillermo Gonzalez]

Avoid creating UDF pointing to (or inside) a symlink.

This branch fix the creation of UDFs pointing to (or inside) a symlink.

[Natalia Bidart (nataliabidart)]

Nice work!

review: Approve

[Stuart Colville (muffinresearch)]

Looks good to me

review: Approve

=== modified file 'tests/syncdaemon/test_vm.py'
--- tests/syncdaemon/test_vm.py	2010-03-29 17:39:04 +0000
+++ tests/syncdaemon/test_vm.py	2010-03-31 21:52:23 +0000
@@ -1707,6 +1707,57 @@
         self.assertEquals(30, self.vm.get_free_space(udf.volume_id))
         self.assertEquals(30, self.vm.get_free_space(root.volume_id))
 
+    @defer.inlineCallbacks
+    def test_UDF_cant_be_a_symlink(self):
+        """Test that a UDF can't be a symlink."""
+        # initialize the root
+        self.vm.handle_SYS_ROOT_RECEIVED('root_uuid')
+        real_udf_path = os.path.join(self.home_dir, "my_udf")
+        udf_path = os.path.join(self.home_dir, "MyUDF")
+        # patch FakeAQ
+        def create_udf(path, name, marker):
+            """Fake create_udf"""
+            self.main.event_q.push("AQ_CREATE_UDF_OK", **dict(volume_id=uuid.uuid4(),
+                                                       node_id=uuid.uuid4(),
+                                                       marker=marker))
+        self.main.action_q.create_udf = create_udf
+        # create the symlink
+        os.makedirs(real_udf_path)
+        os.symlink(real_udf_path, udf_path)
+        d = defer.Deferred()
+        self._listen_for('VM_UDF_CREATE_ERROR', d.callback)
+        self._listen_for('VM_UDF_CREATED', lambda r: d.errback(Exception(r)))
+        self.vm.create_udf(udf_path)
+        result = yield d
+        self.assertEquals(0, len(list(self.vm.udfs.keys())))
+        self.assertEquals(result[0], udf_path)
+        self.assertEquals(result[1], "UDFs can not be a symlink")
+
+    @defer.inlineCallbacks
+    def test_UDF_cant_be_inside_symlink(self):
+        """Test that a UDF can't be inside a symlink."""
+        # initialize the root
+        self.vm.handle_SYS_ROOT_RECEIVED('root_uuid')
+        real_udf_path = os.path.join(self.home_dir, "udf_parent", "my_udf")
+        udf_path = os.path.join(self.home_dir, "MyUDF")
+        # patch FakeAQ
+        def create_udf(path, name, marker):
+            """Fake create_udf"""
+            self.main.event_q.push("AQ_CREATE_UDF_OK", **dict(volume_id=uuid.uuid4(),
+                                                       node_id=uuid.uuid4(),
+                                                       marker=marker))
+        self.main.action_q.create_udf = create_udf
+        # create the symlink
+        os.makedirs(real_udf_path)
+        os.symlink(real_udf_path, udf_path)
+        d = defer.Deferred()
+        self._listen_for('VM_UDF_CREATE_ERROR', d.callback)
+        self._listen_for('VM_UDF_CREATED', lambda r: d.errback(Exception(r)))
+        self.vm.create_udf(udf_path)
+        result = yield d
+        self.assertEquals(0, len(list(self.vm.udfs.keys())))
+        self.assertEquals(result[0], udf_path)
+        self.assertEquals(result[1], "UDFs can not be a symlink")
 
 class MetadataTestCase(BaseTwistedTestCase):
     md_version_None = False

=== modified file 'ubuntuone/syncdaemon/volume_manager.py'
--- ubuntuone/syncdaemon/volume_manager.py	2010-03-29 17:39:04 +0000
+++ ubuntuone/syncdaemon/volume_manager.py	2010-03-31 21:52:23 +0000
@@ -840,8 +840,13 @@
     def create_udf(self, path):
         """Request the creation of a UDF to AQ."""
         self.log.debug('create udf: %r', path)
-        # check if the path it's ok (outside root and isn't a ancestor or
-        # child of another UDF)
+        # check if path is the realpath, bail out if not
+        if os.path.realpath(path) != path:
+            self.m.event_q.push('VM_UDF_CREATE_ERROR', path,
+                                "UDFs can not be a symlink")
+            return
+        # check if the path it's ok (outside root and
+        # isn't a ancestor or child of another UDF)
         if self._is_nested_udf(path):
             self.m.event_q.push('VM_UDF_CREATE_ERROR', path,
                                 "UDFs can not be nested")