Merge lp:~alecu/ubuntuone-client/dont-log-tokens into lp:ubuntuone-client

[Alejandro J. Cura]

Don't log the credentials (LP: #848988)

Don't log the credentials (LP: #848988)

[Roberto Alsina (ralsina)]

+1

review: Approve

[Natalia Bidart (nataliabidart)]

Looks great!

review: Approve

=== modified file 'tests/platform/windows/test_credentials.py'
--- tests/platform/windows/test_credentials.py	2011-08-24 14:25:35 +0000
+++ tests/platform/windows/test_credentials.py	2011-09-13 19:39:19 +0000
@@ -17,14 +17,18 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 """Tests for the Ubuntu One credentials management IPC service."""
 
+import logging
+
 from twisted.internet import defer
 from twisted.trial.unittest import TestCase
 
 from contrib.testing.testcase import FAKED_CREDENTIALS
+from ubuntuone.devtools.handlers import MementoHandler
 from ubuntuone.platform.credentials import APP_NAME
 from ubuntuone.platform.credentials.windows import (
     CredentialsManagement,
     RemovableSignal,
+    logger,
 )
 
 TEST_APP_NAME = "test application"
@@ -110,6 +114,21 @@
         rs(APP_NAME, expected)
         self.assertEqual(sample_store, [expected])
 
+    def test_callable_does_not_log_args(self):
+        """__call__ does not log its arguments."""
+        self.handler = MementoHandler()
+        self.handler.setLevel(logging.DEBUG)
+        logger.addHandler(self.handler)
+        self.addCleanup(logger.removeHandler, self.handler)
+
+        secret_token = "secret token!"
+        test_cb = lambda _: None
+        rs = RemovableSignal(self.proxy, "on_credentials_found_cb", test_cb)
+
+        rs(APP_NAME, {"secret": secret_token})
+        for record in self.handler.records:
+            self.assertNotIn(secret_token, record.message)
+
     def test_dunder_filters_other_apps(self):
         """__call__ filters by app_name."""
         sample_store = []

=== modified file 'ubuntuone/platform/credentials/windows.py'
--- ubuntuone/platform/credentials/windows.py	2011-08-24 15:13:25 +0000
+++ ubuntuone/platform/credentials/windows.py	2011-09-13 19:39:19 +0000
@@ -62,8 +62,8 @@
         if self.callback is not None:
             # drop the app name, callers do not care about it
             args = args[1:]
-            logger.debug('Calling %r with args %r and kwargs %r.',
-                         self.callback, args, kwargs)
+            logger.debug('Calling %r with %d args and %d kwargs.',
+                         self.callback, len(args), len(kwargs))
             return self.callback(*args, **kwargs)
 
     def remove(self):