Merge lp:~facundo/ubuntuone-client/stable-dont-log-credentials into lp:ubuntuone-client/stable-1-4

[Facundo Batista]

Don't log the SYS_USER_CONNECT event related info, as it's private.

Don't log the SYS_USER_CONNECT event related info, as it's private.

Tests included.

[Guillermo Gonzalez (verterok)]

+1

review: Approve

[Natalia Bidart (nataliabidart)]

review: Approve

=== modified file 'tests/syncdaemon/test_eventqueue.py'
--- tests/syncdaemon/test_eventqueue.py	2010-05-26 21:43:27 +0000
+++ tests/syncdaemon/test_eventqueue.py	2010-09-24 18:18:02 +0000
@@ -197,6 +197,24 @@
 
         self.eq.unsubscribe(c)
 
+    def test_log_pushing_data(self):
+        """Pushed event and info should be logged."""
+        self.eq.push("AQ_QUERY_ERROR", 'item', error='err')
+        self.assertTrue(self.log_handler.check_debug(
+            "push_event: AQ_QUERY_ERROR, args:('item',), kw:{'error': 'err'}"))
+
+    def test_log_delete_in_info(self):
+        """Pushed any deletion event should be logged in info."""
+        self.eq.push("FS_DIR_DELETE", 'path')
+        self.assertTrue(self.log_handler.check_info(
+                        "push_event: FS_DIR_DELETE"))
+
+    def test_log_pushing_private_data(self):
+        """SYS_USER_CONNECT event info must not be logged."""
+        self.eq.push("SYS_USER_CONNECT", access_token='foo')
+        self.assertTrue(self.log_handler.check_debug(
+            "push_event: SYS_USER_CONNECT, args:*, kw:*"))
+
 
 class PushTestsWithCallback(BaseEQTestCase):
     """Test the error handling in the event distribution machinery."""

=== modified file 'ubuntuone/syncdaemon/event_queue.py'
--- ubuntuone/syncdaemon/event_queue.py	2010-08-31 14:19:53 +0000
+++ ubuntuone/syncdaemon/event_queue.py	2010-09-24 18:18:02 +0000
@@ -769,6 +769,8 @@
         if event_name.endswith('DELETE'):
             # log every DELETE in INFO level
             self.log.info(log_msg, event_name, args, kwargs)
+        elif event_name == 'SYS_USER_CONNECT':
+            self.log.debug(log_msg, event_name, '*', '*')
         else:
             self.log.debug(log_msg, event_name, args, kwargs)