rsync_remote: Fix a problem when receiving read-only directories. (#145)

Before this change, when the source directories hierarchy was
read-only, the read-only mode would be preserved at the destination,
preventing child directories to be recreated by a normal user (a
permission denied error, EACCES would be raised).

* execnet/rsync_remote.py (serve_rsync.receive_directory_structure):
Bitwise OR to ensure the write bit is set on received directories.
* testing/test_rsync.py (TestRSync)
<test_read_only_directories>: New test.

Author: apteryks

execnet/rsync_remote.py

@@ -35,7 +35,11 @@ def receive_directory_structure(path, relcomponents):
                 os.makedirs(path)
             mode = msg.pop(0)
             if mode:
-                os.chmod(path, mode)
+                # Ensure directories are writable, otherwise a
+                # permission denied error (EACCES) would be raised
+                # when attempting to receive read-only directory
+                # structures.
+                os.chmod(path, mode | 0o700)
             entrynames = {}
             for entryname in msg:
                 destpath = os.path.join(path, entryname)
@@ -59,7 +63,7 @@ def receive_directory_structure(path, relcomponents):
                         checksum = md5(f.read()).digest()
                         f.close()
                     elif msg_mode and msg_mode != st.st_mode:
-                        os.chmod(path, msg_mode)
+                        os.chmod(path, msg_mode | 0o700)
                         return
                     else:
                         return  # already fine

testing/test_rsync.py

@@ -157,6 +157,23 @@ def test_permissions(self, dirs, gw1, gw2):
         mode = destdir.stat().mode
         assert mode & 511 == 504
 
+    @py.test.mark.skipif("sys.platform == 'win32' or getattr(os, '_name', '') == 'nt'")
+    def test_read_only_directories(self, dirs, gw1):
+        source = dirs.source
+        dest = dirs.dest1
+        source.ensure("sub", "subsub", dir=True)
+        source.join("sub").chmod(0o500)
+        source.join("sub", "subsub").chmod(0o500)
+
+        # The destination directories should be created with the write
+        # permission forced, to avoid raising an EACCES error.
+        rsync = RSync(source)
+        rsync.add_target(gw1, dest)
+        rsync.send()
+
+        assert dest.join("sub").stat().mode & 0o700
+        assert dest.join("sub").join("subsub").stat().mode & 0o700
+
     @needssymlink
     def test_symlink_rsync(self, dirs, gw1):
         source = dirs.source