Merge lp:~rye/ubuntuone-client/ignore-in-close-write-in-dirs-stable-3-0 into lp:ubuntuone-client

[Roman Yepishev]

Ignore IN_CLOSE_WRITE for directories

MANUAL TESTING ONLY

If you approve this, please also approve https://code.launchpad.net/~rye/ubuntuone-client/ignore-in-close-write-in-dirs/+merge/106612 which is the same code but for trunk.

This branch adds the same types of filters as are already in place to make sure that events IN_OPEN and IN_CLOSE_NOWRITE work only on files.

eCryptFS layer used in Ubuntu for Private directories can send IN_CLOSE_WRITE on directories breaking syncdaemon and preventing the users from running Ubuntu One with ~/.Private directory.

This patch does not have an automatic test since it is possible to trigger the bug only with eCryptFS mount.

To test:
0. Before patching:
1. Create a private ecryptfs directory: ecryptfs-setup-private and follow all the prompts including relogin.
2. After relogin add underlying ~/.Private folder to Ubuntu One: u1sdtool --create-folder=~/.Private
3. Notice that files do upload
4. Open this directory and put another file in it.

At this point no files will be uploaded for any Ubuntu One directory due to the unexpected event from INotify subsystem. The log will show:
exceptions.KeyError: "Unhandled Event in INotify: <Event dir=True mask=0x40000008 maskname=IN_CLOSE_WRITE|IN_ISDIR name='' path=/home/rtg/.Private pathname=/home/rtg/.Private wd=8 >"

5. Apply the patch and restart syncdaemon.
6. Add another file to the directory. Notice that the amount of entries in https://one.ubuntu.com/files/ in ~/.Private UDF corresponds to the number of files locally (filenames are encrypted).

[lp:~rye/ubuntuone-client/ignore-in-close-write-in-dirs-stable-3-0]

1192. By Alejandro J. Cura on 2012-05-23

Tests for the eCryptFS fix

Unmerged revisions

1192. By Alejandro J. Cura on 2012-05-23

Tests for the eCryptFS fix

1191. By Roman Yepishev on 2012-05-21

Ignore IN_CLOSE_WRITE for directories

1190. By dobey on 2012-05-17

[release] 3.0.1

1189. By dobey on 2012-05-17

Fix the Makefile such that tests will fail properly again

1188. By Facundo Batista on 2012-05-17

Use PathLockTree to get one GetDelta at a time.

1187. By Brian Curtin on 2012-05-17

No longer check whether or not we are actually running as admin on Windows

1186. By Diego Sarmentero on 2012-04-24

- Avoid creating SyncDaemonTool if is not already running and the user wants to close it. (LP: #907479).

1185. By Facundo Batista on 2012-04-24

Use the correct comparison to decide in which queue (LP: #978903).

1184. By Charles Kerr on 2012-04-24

Fix dirpath leak in syncdaemon_daemon_is_folder_enabled()

1183. By dobey on 2012-04-11

[release] 3.0.0

=== modified file 'Makefile.am'
--- Makefile.am	2012-05-15 13:25:37 +0000
+++ Makefile.am	2012-05-21 11:50:22 +0000
@@ -54,8 +54,13 @@
 test: logging.conf $(clientdefs_DATA) Makefile
 	echo "$(PYTHONPATH)"
 	if test "x$(builddir)" == "x$(srcdir)"; then \
+<<<<<<< TREE
 		PYTHONPATH="$(PYTHONPATH)" u1trial -r $(REACTOR) -p tests/platform/windows,tests/proxy -i "test_windows.py,test_darwin.py" tests || exit 1; \
 		PYTHONPATH="$(PYTHONPATH)" u1trial -r qt4 -p tests/platform/windows -i "test_windows.py,test_darwin.py" tests/proxy || exit 1; \
+=======
+		PYTHONPATH="$(PYTHONPATH)" u1trial -r $(REACTOR) -p tests/platform/windows,tests/proxy tests || exit 1; \
+		PYTHONPATH="$(PYTHONPATH)" u1trial -r qt4 -p tests/platform/windows tests/proxy || exit 1; \
+>>>>>>> MERGE-SOURCE
 	fi
 	rm -rf _trial_temp
 

=== modified file 'configure.ac'
--- configure.ac	2012-02-10 15:07:59 +0000
+++ configure.ac	2012-05-21 11:50:22 +0000
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.53)
 
-AC_INIT([ubuntuone-client], [3.1])
+AC_INIT([ubuntuone-client], [3.0.1])
 AC_CONFIG_SRCDIR([config.h.in])
 
 AM_INIT_AUTOMAKE([1.10 foreign])

=== modified file 'tests/platform/os_helper/test_windows.py'
=== modified file 'ubuntuone/platform/filesystem_notifications/linux.py'
--- ubuntuone/platform/filesystem_notifications/linux.py	2012-05-14 21:24:24 +0000
+++ ubuntuone/platform/filesystem_notifications/linux.py	2012-05-21 11:50:22 +0000
@@ -212,6 +212,16 @@
         if not (event.mask & pyinotify.IN_ISDIR):
             self.general_processor.push_event(event)
 
+    @validate_filename
+    def process_IN_CLOSE_WRITE(self, event):
+        """Filter IN_CLOSE_WRITE to make it happen only in files.
+        
+        eCryptFS sends IN_CLOSE_WRITE event for lower directories.
+
+        """
+        if not (event.mask & pyinotify.IN_ISDIR):
+            self.general_processor.push_event(event)
+
     def process_IN_MOVE_SELF(self, event):
         """Don't do anything here.
 

=== modified file 'windows/clientdefs.py'
--- windows/clientdefs.py	2012-04-09 20:07:05 +0000
+++ windows/clientdefs.py	2012-05-21 11:50:22 +0000
@@ -41,7 +41,7 @@
 Q_ = lambda string: gettext.dgettext(GETTEXT_PACKAGE, string)
 
 # pylint: disable-msg=C0301
-VERSION = '0.1'
+VERSION = '3.0.0'
 LOCALEDIR = ''
 LIBEXECDIR = ''
 GETTEXT_PACKAGE = ''