Merge lp:~nataliabidart/ubuntuone-control-panel/raise-and-handle-unauthorized into lp:ubuntuone-control-panel

[Natalia Bidart]

- If servers reply with a 401, clear credentials and ask user to authenticate (LP: #726612).

To test IRL, you need to do a little tweak in the source code due to bug #751895.

- edit ubuntuone/controlpanel/webclient.py:66 and add the 400 error to the list of unauthorized errors
- killall ubuntuone-control-panel-backend
- in 2 terminals, run both the backend and the frontend from this branch:

DEBUG=True PYTHONPATH=. ./bin/ubuntuone-control-panel-backend
DEBUG=True PYTHONPATH=. ./bin/ubuntuone-control-panel-gtk

While you have your panel opened, go to https://one.ubuntu.com/account/machines/ and remove the computer you're currently using. Then, try to go to the folders tab or to remove a device (browsing devices will show an empty list due to bug #695820.
You should be redirected to the overview page and you should get your U1 credentials cleared from your local system.

[Roberto Alsina (ralsina)]

+1

[Roman Yepishev (rye)]

Awesome!

review: Approve (fieldtest)

[Roberto Alsina (ralsina)]

review: Approve

[Natalia Bidart (nataliabidart)]

The attempt to merge lp:~nataliabidart/ubuntuone-control-panel/raise-and-handle-unauthorized into lp:ubuntuone-control-panel failed. Below is the output from the failed tests.

Running test suite for ubuntuone/controlpanel
Xlib: extension "RANDR" missing on display ":99".
ubuntuone.controlpanel.gtk.tests
  BaseTestCase
    runTest ... [OK]
ubuntuone.controlpanel.gtk.tests.test_gui_basic
  ControlPanelMixinTestCase
    test_is_a_control_panel_mixin ... [OK]
    test_ui_can_be_created ... [OK]
  ControlPanelTestCase
    test_backend_is_shutdown_on_close ... [OK]
    test_credentials_found_connects_syncdaemon ... [OK]
    test_credentials_found_shows_dashboard_panel ... [OK]
    test_credentials_found_shows_services_panel ... [OK]
    test_is_a_notebook ... [OK]
    test_local_device_removed_shows_overview_panel ... [OK]
    test_main_window_is_passed_to_child ... [OK]
    test_on_show_management_panel ... [OK]
    test_on_show_management_panel_is_idempotent ... [OK]
    test_overview_is_shown_at_startup ... [OK]
    test_startup_props ... [OK]
    test_startup_visibility ... [OK]
    test_unauthorized_shows_overview_panel ... [OK]
  ControlPanelWindowAlertParamTestCase
    test_alert ... [OK]
  ControlPanelWindowInvalidParamsTestCase
    test_closing_stops_the_main_lopp ... [OK]
    test_control_panel_is_the_only_child ... [OK]
    test_icon_name_is_correct ... [OK]
    test_is_a_window ... [OK]
    test_main_start_gtk_main_loop ... [OK]
    test_main_window_is_passed_to_child ... [OK]
    test_max_size ... [OK]
    test_startup_visibility ... [OK]
    test_switch_to ... [OK]
    test_title_is_correct ... [OK]
  ControlPanelWindowParamsNoneTestCase
    test_closing_stops_the_main_lopp ... [OK]
    test_control_panel_is_the_only_child ... [OK]
    test_icon_name_is_correct ... [OK]
    test_is_a_window ... [OK]
    test_main_start_gtk_main_loop ... [OK]
    test_main_window_is_passed_to_child ... [OK]
    test_max_size ....

[lp:~nataliabidart/ubuntuone-control-panel/raise-and-handle-unauthorized]

135. By Natalia Bidart on 2011-04-07

Increasing the timeout fr webclient tests.

=== modified file 'ubuntuone/controlpanel/backend.py'
--- ubuntuone/controlpanel/backend.py	2011-04-03 03:07:53 +0000
+++ ubuntuone/controlpanel/backend.py	2011-04-07 15:22:46 +0000
@@ -20,14 +20,17 @@
 """A backend for the Ubuntu One Control Panel."""
 
 from collections import defaultdict
+from functools import wraps
 
 from twisted.internet.defer import inlineCallbacks, returnValue
 
 from ubuntuone.controlpanel import dbus_client
 from ubuntuone.controlpanel import replication_client
 from ubuntuone.controlpanel.logger import setup_logging, log_call
-from ubuntuone.controlpanel.webclient import WebClient, WebClientError
-
+# pylint: disable=W0611
+from ubuntuone.controlpanel.webclient import (UnauthorizedError,
+    WebClient, WebClientError)
+# pylint: enable=W0611
 
 logger = setup_logging('backend')
 
@@ -71,6 +74,25 @@
     return result
 
 
+def process_unauthorized(f):
+    """Decorator to catch UnauthorizedError from the webclient and act upon."""
+
+    @inlineCallbacks
+    @wraps(f)
+    def inner(*args, **kwargs):
+        """Handle UnauthorizedError and clear credentials."""
+        try:
+            result = yield f(*args, **kwargs)
+        except UnauthorizedError, e:
+            logger.exception('process_unauthorized (clearing credentials):')
+            yield dbus_client.clear_credentials()
+            raise e
+
+        returnValue(result)
+
+    return inner
+
+
 class ControlBackend(object):
     """The control panel backend."""
 
@@ -224,6 +246,7 @@
         returnValue(is_local)
 
     @log_call(logger.debug)
+    @process_unauthorized
     @inlineCallbacks
     def account_info(self):
         """Get the user account info."""
@@ -251,6 +274,7 @@
         returnValue(result)
 
     @log_call(logger.debug)
+    @process_unauthorized
     @inlineCallbacks
     def devices_info(self):
         """Get the user devices info."""
@@ -267,6 +291,8 @@
 
         try:
             devices = yield self.wc.call_api(DEVICES_API)
+        except UnauthorizedError:
+            raise
         except WebClientError:
             logger.exception('devices_info: web client failure:')
         else:
@@ -345,6 +371,7 @@
         returnValue(device_id)
 
     @log_call(logger.warning, with_args=False)
+    @process_unauthorized
     @inlineCallbacks
     def remove_device(self, device_id):
         """Remove a device's tokens from the sso server."""

=== modified file 'ubuntuone/controlpanel/dbus_service.py'
--- ubuntuone/controlpanel/dbus_service.py	2011-03-31 14:43:41 +0000
+++ ubuntuone/controlpanel/dbus_service.py	2011-04-07 15:22:46 +0000
@@ -32,7 +32,7 @@
 from ubuntuone.controlpanel import (DBUS_BUS_NAME, DBUS_PREFERENCES_PATH,
     DBUS_PREFERENCES_IFACE)
 from ubuntuone.controlpanel.backend import (
-    ControlBackend, filter_field,
+    ControlBackend, filter_field, UnauthorizedError,
     FILE_SYNC_DISABLED, FILE_SYNC_DISCONNECTED,
     FILE_SYNC_ERROR, FILE_SYNC_IDLE, FILE_SYNC_STARTING, FILE_SYNC_STOPPED,
     FILE_SYNC_SYNCING,
@@ -78,7 +78,7 @@
     return result
 
 
-def transform_failure(f):
+def transform_failure(f, auth_error=None):
     """Decorator to apply to DBus error signals.
 
     With this call, a Failure is transformed into a string-string dict.
@@ -88,7 +88,9 @@
         """Do the Failure transformation."""
         logger.error('processing failure: %r', error.printTraceback())
         error_dict = error_handler(error)
-        if _ is not None:
+        if auth_error is not None and error.check(UnauthorizedError):
+            result = auth_error(error_dict)
+        elif _ is not None:
             result = f(_, error_dict)
         else:
             result = f(error_dict)
@@ -117,19 +119,25 @@
         super(ControlPanelBackend, self).__init__(*args, **kwargs)
         self.backend = backend
         self.backend.status_changed_handler = self.process_status
+        self.transform = lambda f: transform_failure(f, self.UnauthorizedError)
         logger.debug('ControlPanelBackend: created with %r, %r.\n'
                      'status_changed_handler is %r.',
                      args, kwargs, self.process_status)
 
     # pylint: disable=C0103
 
+    @log_call(logger.error)
+    @signal(dbus_interface=DBUS_PREFERENCES_IFACE, signature="a{ss}")
+    def UnauthorizedError(self, error):
+        """The credentials are not valid."""
+
     @log_call(logger.debug)
     @method(dbus_interface=DBUS_PREFERENCES_IFACE, in_signature="")
     def account_info(self):
         """Find out the account info for the current logged in user."""
         d = self.backend.account_info()
         d.addCallback(self.AccountInfoReady)
-        d.addErrback(transform_failure(self.AccountInfoError))
+        d.addErrback(self.transform(self.AccountInfoError))
 
     @log_call(logger.debug)
     @signal(dbus_interface=DBUS_PREFERENCES_IFACE, signature="a{ss}")
@@ -149,7 +157,7 @@
         """Find out the devices info for the logged in user."""
         d = self.backend.devices_info()
         d.addCallback(self.DevicesInfoReady)
-        d.addErrback(transform_failure(self.DevicesInfoError))
+        d.addErrback(self.transform(self.DevicesInfoError))
 
     @signal(dbus_interface=DBUS_PREFERENCES_IFACE, signature="aa{ss}")
     def DevicesInfoReady(self, info):
@@ -170,7 +178,7 @@
         """Configure a given device."""
         d = self.backend.change_device_settings(device_id, settings)
         d.addCallback(self.DeviceSettingsChanged)
-        d.addErrback(transform_failure(self.DeviceSettingsChangeError),
+        d.addErrback(self.transform(self.DeviceSettingsChangeError),
                      device_id)
 
     @log_call(logger.info, with_args=False)
@@ -191,7 +199,7 @@
         """Remove a given device."""
         d = self.backend.remove_device(device_id)
         d.addCallback(self.DeviceRemoved)
-        d.addErrback(transform_failure(self.DeviceRemovalError), device_id)
+        d.addErrback(self.transform(self.DeviceRemovalError), device_id)
 
     @log_call(logger.warning, with_args=False)
     @signal(dbus_interface=DBUS_PREFERENCES_IFACE, signature="s")
@@ -237,7 +245,7 @@
         """Get the status of the file sync service."""
         d = self.backend.file_sync_status()
         d.addCallback(self.process_status)
-        d.addErrback(transform_failure(self.FileSyncStatusError))
+        d.addErrback(self.transform(self.FileSyncStatusError))
 
     @log_call(logger.debug)
     @signal(dbus_interface=DBUS_PREFERENCES_IFACE, signature="s")
@@ -287,7 +295,7 @@
         """Enable the files service."""
         d = self.backend.enable_files()
         d.addCallback(lambda _: self.FilesEnabled())
-        d.addErrback(transform_failure(self.FilesEnableError))
+        d.addErrback(self.transform(self.FilesEnableError))
 
     @log_call(logger.debug)
     @signal(dbus_interface=DBUS_PREFERENCES_IFACE)
@@ -307,7 +315,7 @@
         """Disable the files service."""
         d = self.backend.disable_files()
         d.addCallback(lambda _: self.FilesDisabled())
-        d.addErrback(transform_failure(self.FilesDisableError))
+        d.addErrback(self.transform(self.FilesDisableError))
 
     @log_call(logger.debug)
     @signal(dbus_interface=DBUS_PREFERENCES_IFACE)
@@ -327,7 +335,7 @@
         """Connect the files service."""
         d = self.backend.connect_files()
         d.addCallback(lambda _: self.FilesConnected())
-        d.addErrback(transform_failure(self.FilesConnectError))
+        d.addErrback(self.transform(self.FilesConnectError))
 
     @log_call(logger.debug)
     @signal(dbus_interface=DBUS_PREFERENCES_IFACE)
@@ -347,7 +355,7 @@
         """Disconnect the files service."""
         d = self.backend.disconnect_files()
         d.addCallback(lambda _: self.FilesDisconnected())
-        d.addErrback(transform_failure(self.FilesDisconnectError))
+        d.addErrback(self.transform(self.FilesDisconnectError))
 
     @log_call(logger.debug)
     @signal(dbus_interface=DBUS_PREFERENCES_IFACE)
@@ -367,7 +375,7 @@
         """Restart the files service."""
         d = self.backend.restart_files()
         d.addCallback(lambda _: self.FilesRestarted())
-        d.addErrback(transform_failure(self.FilesRestartError))
+        d.addErrback(self.transform(self.FilesRestartError))
 
     @log_call(logger.debug)
     @signal(dbus_interface=DBUS_PREFERENCES_IFACE)
@@ -387,7 +395,7 @@
         """Start the files service."""
         d = self.backend.start_files()
         d.addCallback(lambda _: self.FilesStarted())
-        d.addErrback(transform_failure(self.FilesStartError))
+        d.addErrback(self.transform(self.FilesStartError))
 
     @log_call(logger.debug)
     @signal(dbus_interface=DBUS_PREFERENCES_IFACE)
@@ -407,7 +415,7 @@
         """Stop the files service."""
         d = self.backend.stop_files()
         d.addCallback(lambda _: self.FilesStopped())
-        d.addErrback(transform_failure(self.FilesStopError))
+        d.addErrback(self.transform(self.FilesStopError))
 
     @log_call(logger.debug)
     @signal(dbus_interface=DBUS_PREFERENCES_IFACE)
@@ -427,7 +435,7 @@
         """Find out the volumes info for the logged in user."""
         d = self.backend.volumes_info()
         d.addCallback(self.VolumesInfoReady)
-        d.addErrback(transform_failure(self.VolumesInfoError))
+        d.addErrback(self.transform(self.VolumesInfoError))
 
     @log_call(logger.debug)
     @signal(dbus_interface=DBUS_PREFERENCES_IFACE, signature="a(ssaa{ss})")
@@ -447,7 +455,7 @@
         """Configure a given volume."""
         d = self.backend.change_volume_settings(volume_id, settings)
         d.addCallback(self.VolumeSettingsChanged)
-        d.addErrback(transform_failure(self.VolumeSettingsChangeError),
+        d.addErrback(self.transform(self.VolumeSettingsChangeError),
                      volume_id)
 
     @log_call(logger.info)
@@ -468,7 +476,7 @@
         """Return the replications info."""
         d = self.backend.replications_info()
         d.addCallback(self.ReplicationsInfoReady)
-        d.addErrback(transform_failure(self.ReplicationsInfoError))
+        d.addErrback(self.transform(self.ReplicationsInfoError))
 
     @log_call(logger.debug)
     @signal(dbus_interface=DBUS_PREFERENCES_IFACE, signature="aa{ss}")
@@ -488,7 +496,7 @@
         """Configure a given replication."""
         d = self.backend.change_replication_settings(replication_id, settings)
         d.addCallback(self.ReplicationSettingsChanged)
-        d.addErrback(transform_failure(self.ReplicationSettingsChangeError),
+        d.addErrback(self.transform(self.ReplicationSettingsChangeError),
                      replication_id)
 
     @log_call(logger.info)
@@ -509,7 +517,7 @@
         """Check if the extension to sync bookmarks is installed."""
         d = self.backend.query_bookmark_extension()
         d.addCallback(self.QueryBookmarksResult)
-        d.addErrback(transform_failure(self.QueryBookmarksError))
+        d.addErrback(self.transform(self.QueryBookmarksError))
 
     @log_call(logger.debug)
     @signal(dbus_interface=DBUS_PREFERENCES_IFACE, signature="b")
@@ -529,7 +537,7 @@
         """Install the extension to sync bookmarks."""
         d = self.backend.install_bookmarks_extension()
         d.addCallback(lambda _: self.InstallBookmarksSuccess())
-        d.addErrback(transform_failure(self.InstallBookmarksError))
+        d.addErrback(self.transform(self.InstallBookmarksError))
 
     @log_call(logger.info)
     @signal(dbus_interface=DBUS_PREFERENCES_IFACE, signature="")

=== modified file 'ubuntuone/controlpanel/gtk/gui.py'
--- ubuntuone/controlpanel/gtk/gui.py	2011-04-06 22:25:04 +0000
+++ ubuntuone/controlpanel/gtk/gui.py	2011-04-07 15:22:46 +0000
@@ -1323,6 +1323,8 @@
         self.button.connect('clicked', self._on_button_clicked)
         self.pack_start(self.button, expand=False)
 
+        self.show_all()
+
         self.backend.connect_to_signal('FileSyncStatusDisabled',
                                        self.on_file_sync_status_disabled)
         self.backend.connect_to_signal('FileSyncStatusStarting',
@@ -1344,10 +1346,6 @@
         self.backend.connect_to_signal('FilesDisabled',
                                        self.on_file_sync_status_disabled)
 
-        self.backend.file_sync_status(reply_handler=NO_OP,
-                                      error_handler=error_handler)
-        self.show_all()
-
     def _update_status(self, msg, action, callback,
                        icon=None, color=None, tooltip=None):
         """Update the status info."""
@@ -1460,6 +1458,11 @@
         self.backend.stop_files(reply_handler=NO_OP,
                                 error_handler=error_handler)
 
+    def load(self):
+        """Load the information."""
+        self.backend.file_sync_status(reply_handler=NO_OP,
+                                      error_handler=error_handler)
+
 
 class ManagementPanel(gtk.VBox, ControlPanelMixin):
     """The management panel.
@@ -1471,6 +1474,7 @@
     __gsignals__ = {
         'local-device-removed': (gobject.SIGNAL_RUN_FIRST,
                                  gobject.TYPE_NONE, ()),
+        'unauthorized': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, ()),
     }
 
     QUOTA_LABEL = _('Using %(used)s of %(total)s (%(percentage).0f%%)')
@@ -1496,6 +1500,8 @@
                                        self.on_account_info_ready)
         self.backend.connect_to_signal('AccountInfoError',
                                        self.on_account_info_error)
+        self.backend.connect_to_signal('UnauthorizedError',
+                                       self.on_unauthorized_error)
 
         self.quota_progressbar.set_sensitive(False)
 
@@ -1536,7 +1542,6 @@
 
         self.services_button.set_name(self.SERVICES_BUTTON_NAME)
         self.services_button.set_tooltip_text(self.SERVICES_BUTTON_TOOLTIP)
-        self.services.load()
 
         self.enable_volumes = lambda: self.volumes_button.set_sensitive(True)
         self.disable_volumes = lambda: self.volumes_button.set_sensitive(False)
@@ -1571,6 +1576,8 @@
         """Load the account info and file sync status list."""
         self.backend.account_info(reply_handler=NO_OP,
                                   error_handler=error_handler)
+        self.status_label.load()
+        self.services.load()
 
     @log_call(logger.debug)
     def on_account_info_ready(self, info):
@@ -1586,6 +1593,11 @@
         """Backend notifies of an error when fetching account info."""
         self._update_quota(msg='')
 
+    @log_call(logger.error)
+    def on_unauthorized_error(self, error_dict=None):
+        """Backend notifies that credentials are not valid."""
+        self.emit('unauthorized')
+
 
 class ControlPanel(gtk.Notebook, ControlPanelMixin):
     """The control panel per se, can be added into any other widget."""
@@ -1613,6 +1625,8 @@
                               self.on_show_management_panel)
         self.management.connect('local-device-removed',
                                 self.on_show_overview_panel)
+        self.management.connect('unauthorized',
+                                self.on_show_overview_panel)
 
         self.show()
         self.on_show_overview_panel()

=== modified file 'ubuntuone/controlpanel/gtk/package_manager.py'
--- ubuntuone/controlpanel/gtk/package_manager.py	2011-02-22 19:28:14 +0000
+++ ubuntuone/controlpanel/gtk/package_manager.py	2011-04-07 15:22:46 +0000
@@ -20,13 +20,14 @@
 
 import apt
 import aptdaemon.client
+# pylint: disable=W0404
 import aptdaemon.enums
 
 try:
-    # Unable to import 'defer', pylint: disable=F0401,E0611
+    # Unable to import 'defer', pylint: disable=F0401,E0611,W0404
     from aptdaemon.defer import inline_callbacks, return_value
 except ImportError:
-    # Unable to import 'defer', pylint: disable=F0401,E0611
+    # Unable to import 'defer', pylint: disable=F0401,E0611,W0404
     from defer import inline_callbacks, return_value
 from aptdaemon.gtkwidgets import AptProgressBar
 

=== modified file 'ubuntuone/controlpanel/gtk/tests/test_gui.py'
--- ubuntuone/controlpanel/gtk/tests/test_gui.py	2011-04-04 21:28:18 +0000
+++ ubuntuone/controlpanel/gtk/tests/test_gui.py	2011-04-07 15:22:46 +0000
@@ -1680,8 +1680,9 @@
         for sig, handlers in matches:
             self.assertEqual(self.ui.backend._signals[sig], handlers)
 
-    def test_file_sync_status_is_requested(self):
+    def test_file_sync_status_is_requested_on_load(self):
         """The file sync status is requested to the backend."""
+        self.ui.load()
         self.assert_backend_called('file_sync_status', ())
 
     def test_on_file_sync_status_disabled(self):
@@ -1912,11 +1913,32 @@
         self.assertEqual(self.ui.backend._signals['AccountInfoError'],
                          [self.ui.on_account_info_error])
 
+    def test_backend_unauthorized_signal(self):
+        """The proper signals are connected to the backend."""
+        self.assertEqual(self.ui.backend._signals['UnauthorizedError'],
+                         [self.ui.on_unauthorized_error])
+
+    def test_no_backend_calls_before_load(self):
+        """No calls are made to the backend before load() is called."""
+        self.assertEqual(self.ui.backend._called, {})
+
     def test_account_info_is_requested_on_load(self):
         """The account info is requested to the backend."""
         self.ui.load()
         self.assert_backend_called('account_info', ())
 
+    def test_file_sync_status_info_is_requested_on_load(self):
+        """The file sync status info is requested to the backend."""
+        self.patch(self.ui.status_label, 'load', self._set_called)
+        self.ui.load()
+        self.assertEqual(self._called, ((), {}))
+
+    def test_replications_info_is_requested_on_load(self):
+        """The replications info is requested to the backend."""
+        self.patch(self.ui.services, 'load', self._set_called)
+        self.ui.load()
+        self.assertEqual(self._called, ((), {}))
+
     def test_dashboard_panel_is_packed(self):
         """The dashboard panel is packed."""
         self.assertIsInstance(self.ui.dashboard, gui.DashboardPanel)
@@ -2071,3 +2093,9 @@
             actual = getattr(self.ui, '%s_button' % tab).get_tooltip_text()
             expected = getattr(self.ui, '%s_BUTTON_TOOLTIP' % tab.upper())
             self.assertEqual(actual, expected)
+
+    def test_on_unauthorized_error(self):
+        """On invalid credentials, proper signal is sent."""
+        self.ui.connect('unauthorized', self._set_called)
+        self.ui.on_unauthorized_error()
+        self.assertEqual(self._called, ((self.ui,), {}))

=== modified file 'ubuntuone/controlpanel/gtk/tests/test_gui_basic.py'
--- ubuntuone/controlpanel/gtk/tests/test_gui_basic.py	2011-04-01 16:10:44 +0000
+++ ubuntuone/controlpanel/gtk/tests/test_gui_basic.py	2011-04-07 15:22:46 +0000
@@ -206,8 +206,10 @@
 
     def test_on_show_management_panel(self):
         """A ManagementPanel is shown when the callback is executed."""
+        self.patch(self.ui.management, 'load', self._set_called)
         self.ui.on_show_management_panel()
         self.assert_current_tab_correct(self.ui.management)
+        self.assertEqual(self._called, ((), {}))
 
     def test_on_show_management_panel_is_idempotent(self):
         """Only one ManagementPanel is shown."""
@@ -256,6 +258,13 @@
 
         self.assert_current_tab_correct(self.ui.overview)
 
+    def test_unauthorized_shows_overview_panel(self):
+        """On 'unauthorized' signal, the overview panel is shown."""
+        self.ui.overview.emit('credentials-found', True, object())
+        self.ui.management.emit('unauthorized')
+
+        self.assert_current_tab_correct(self.ui.overview)
+
     def test_backend_is_shutdown_on_close(self):
         """When the control panel is closed, the backend is shutdown."""
         self.ui.emit('destroy')

=== modified file 'ubuntuone/controlpanel/gtk/tests/test_package_manager.py'
--- ubuntuone/controlpanel/gtk/tests/test_package_manager.py	2011-01-03 14:20:12 +0000
+++ ubuntuone/controlpanel/gtk/tests/test_package_manager.py	2011-04-07 15:22:46 +0000
@@ -21,10 +21,10 @@
 import collections
 
 try:
-    # Unable to import 'defer', pylint: disable=F0401,E0611
+    # Unable to import 'defer', pylint: disable=F0401,E0611,W0404
     from aptdaemon import defer
 except ImportError:
-    # Unable to import 'defer', pylint: disable=F0401,E0611
+    # Unable to import 'defer', pylint: disable=F0401,E0611,W0404
     import defer
 
 from ubuntuone.controlpanel.gtk import package_manager

=== modified file 'ubuntuone/controlpanel/integrationtests/__init__.py'
--- ubuntuone/controlpanel/integrationtests/__init__.py	2010-12-08 19:44:53 +0000
+++ ubuntuone/controlpanel/integrationtests/__init__.py	2011-04-07 15:22:46 +0000
@@ -20,7 +20,6 @@
 """Integration tests for the Ubuntu One Control Panel."""
 
 import dbus
-import dbus.service
 
 from ubuntuone.devtools.testcase import DBusTestCase as TestCase
 
@@ -31,7 +30,7 @@
     """A DBus exception to be used in tests."""
 
 
-class MockDBusNoMethods(dbus.service.Object):
+class MockDBusNoMethods(dbus_service.dbus.service.Object):
     """A mock that fails at the DBus layer (because it's got no methods!)."""
 
 

=== modified file 'ubuntuone/controlpanel/integrationtests/test_dbus_service.py'
--- ubuntuone/controlpanel/integrationtests/test_dbus_service.py	2011-03-28 17:25:21 +0000
+++ ubuntuone/controlpanel/integrationtests/test_dbus_service.py	2011-04-07 15:22:46 +0000
@@ -624,6 +624,35 @@
             error_sig, success_sig, got_error_signal, method, *args)
 
 
+class OperationsAuthErrorTestCase(OperationsTestCase):
+    """Test for the DBus service operations when UnauthorizedError happens."""
+
+    def setUp(self):
+        super(OperationsAuthErrorTestCase, self).setUp()
+        self.patch(MockBackend, 'exception',
+                   dbus_service.UnauthorizedError)
+
+    def assert_correct_method_call(self, success_sig, error_sig, success_cb,
+                                   method, *args):
+        """Call parent instance expecting UnauthorizedError signal."""
+
+        def inner_success_cb(*a):
+            """The success signal was received."""
+            if len(a) == 1:
+                error_dict = a[0]
+            else:
+                an_id, error_dict = a
+                self.assertEqual(an_id, args[0])
+
+            self.assertEqual(error_dict[dbus_service.ERROR_TYPE],
+                             'UnauthorizedError')
+            self.deferred.callback('success')
+
+        parent = super(OperationsAuthErrorTestCase, self)
+        return parent.assert_correct_method_call(
+            "UnauthorizedError", error_sig, inner_success_cb, method, *args)
+
+
 class FileSyncTestCase(BaseTestCase):
     """Test for the DBus service when requesting file sync status."""
 

=== modified file 'ubuntuone/controlpanel/integrationtests/test_webclient.py'
--- ubuntuone/controlpanel/integrationtests/test_webclient.py	2010-12-02 16:23:03 +0000
+++ ubuntuone/controlpanel/integrationtests/test_webclient.py	2011-04-07 15:22:46 +0000
@@ -73,6 +73,10 @@
         devices_resource.contents = SAMPLE_RESOURCE
         root.putChild("devices", devices_resource)
         root.putChild("throwerror", resource.NoResource())
+        unauthorized = resource.ErrorPage(resource.http.UNAUTHORIZED,
+                                          "Unauthrorized", "Unauthrorized")
+        root.putChild("unauthorized", unauthorized)
+
         site = server.Site(root)
         application = service.Application('web')
         self.service_collection = service.IServiceCollection(application)
@@ -96,7 +100,7 @@
 class WebClientTestCase(TestCase):
     """Test for the webservice client."""
 
-    timeout = 5
+    timeout = 8
 
     def setUp(self):
         super(WebClientTestCase, self).setUp()
@@ -123,6 +127,12 @@
         yield self.assertFailure(self.wc.call_api("throwerror"),
                                  webclient.WebClientError)
 
+    @inlineCallbacks
+    def test_unauthorized(self):
+        """Detect when a request failed with UNAUTHORIZED."""
+        yield self.assertFailure(self.wc.call_api("unauthorized"),
+                                 webclient.UnauthorizedError)
+
 
 class OAuthTestCase(TestCase):
     """Test for the oauth signing code."""

=== modified file 'ubuntuone/controlpanel/replication_client.py'
--- ubuntuone/controlpanel/replication_client.py	2011-01-06 20:40:15 +0000
+++ ubuntuone/controlpanel/replication_client.py	2011-04-07 15:22:46 +0000
@@ -57,7 +57,7 @@
     if replication_module is None:
         # delay import in case DC is not installed at module import time
         # Unable to import 'desktopcouch.application.replication_services'
-        # pylint: disable=F0401
+        # pylint: disable=W0404
         from desktopcouch.application.replication_services \
             import ubuntuone as replication_module
     try:

=== modified file 'ubuntuone/controlpanel/tests/test_backend.py'
--- ubuntuone/controlpanel/tests/test_backend.py	2011-04-03 03:07:53 +0000
+++ ubuntuone/controlpanel/tests/test_backend.py	2011-04-07 15:22:46 +0000
@@ -59,7 +59,6 @@
     SHARES_PATH_LINK,
     TOKEN,
 )
-from ubuntuone.controlpanel.webclient import WebClientError
 
 
 class MockWebClient(object):
@@ -73,8 +72,10 @@
 
     def call_api(self, method):
         """Get a given url from the webservice."""
-        if self.failure:
-            return defer.fail(WebClientError(self.failure))
+        if self.failure == 401:
+            return defer.fail(backend.UnauthorizedError(self.failure))
+        elif self.failure:
+            return defer.fail(backend.WebClientError(self.failure))
         else:
             result = simplejson.loads(self.results[method])
             return defer.succeed(result)
@@ -326,7 +327,20 @@
         """The account_info method exercises its errback."""
         # pylint: disable=E1101
         self.be.wc.failure = 404
-        yield self.assertFailure(self.be.account_info(), WebClientError)
+        yield self.assertFailure(self.be.account_info(),
+                                 backend.WebClientError)
+
+    @inlineCallbacks
+    def test_account_info_fails_with_unauthorized(self):
+        """The account_info clears the credentials on unauthorized."""
+        # pylint: disable=E1101
+        self.be.wc.failure = 401
+        d = defer.Deferred()
+        self.patch(backend.dbus_client, 'clear_credentials',
+                   lambda: d.callback('called'))
+        yield self.assertFailure(self.be.account_info(),
+                                 backend.UnauthorizedError)
+        yield d
 
 
 class BackendDevicesTestCase(BackendBasicTestCase):
@@ -362,6 +376,18 @@
                                                  'web client failure'))
 
     @inlineCallbacks
+    def test_devices_info_fails_with_unauthorized(self):
+        """The devices_info clears the credentials on unauthorized."""
+        # pylint: disable=E1101
+        self.be.wc.failure = 401
+        d = defer.Deferred()
+        self.patch(backend.dbus_client, 'clear_credentials',
+                   lambda: d.callback('called'))
+        yield self.assertFailure(self.be.devices_info(),
+                                 backend.UnauthorizedError)
+        yield d
+
+    @inlineCallbacks
     def test_devices_info_if_files_disable(self):
         """The devices_info returns device only info if files is disabled."""
         yield self.be.disable_files()
@@ -436,7 +462,19 @@
         # pylint: disable=E1101
         self.be.wc.failure = 404
         yield self.assertFailure(self.be.remove_device(self.local_token),
-                                 WebClientError)
+                                 backend.WebClientError)
+
+    @inlineCallbacks
+    def test_remove_device_fails_with_unauthorized(self):
+        """The remove_device clears the credentials on unauthorized."""
+        # pylint: disable=E1101
+        self.be.wc.failure = 401
+        d = defer.Deferred()
+        self.patch(backend.dbus_client, 'clear_credentials',
+                   lambda: d.callback('called'))
+        yield self.assertFailure(self.be.remove_device(self.local_token),
+                                 backend.UnauthorizedError)
+        yield d
 
     @inlineCallbacks
     def test_remove_device_does_not_log_device_id(self):

=== modified file 'ubuntuone/controlpanel/utils.py'
--- ubuntuone/controlpanel/utils.py	2010-12-08 13:56:25 +0000
+++ ubuntuone/controlpanel/utils.py	2011-04-07 15:22:46 +0000
@@ -52,7 +52,7 @@
 
     # otherwise, try to load PROJECT_DIR from installation path
     try:
-        # pylint: disable=F0401, E0611
+        # pylint: disable=F0401, E0611, W0404
         from ubuntuone.controlpanel.constants import PROJECT_DIR
         return PROJECT_DIR
     except ImportError:

=== modified file 'ubuntuone/controlpanel/webclient.py'
--- ubuntuone/controlpanel/webclient.py	2011-03-31 18:40:33 +0000
+++ ubuntuone/controlpanel/webclient.py	2011-04-07 15:22:46 +0000
@@ -32,10 +32,18 @@
 logger = setup_logging('webclient')
 
 
+# full list of status codes
+# http://library.gnome.org/devel/libsoup/stable/libsoup-2.4-soup-status.html
+
+
 class WebClientError(Exception):
     """An http error happened while calling the webservice."""
 
 
+class UnauthorizedError(WebClientError):
+    """The request ended with bad_request, unauthorized or forbidden."""
+
+
 class WebClient(object):
     """A client for the u1 webservice."""
 
@@ -55,7 +63,10 @@
             result = simplejson.loads(data)
             d.callback(result)
         else:
-            e = WebClientError(msg.status_code, data)
+            if msg.status_code in (401,):
+                e = UnauthorizedError(msg.status_code, data)
+            else:
+                e = WebClientError(msg.status_code, data)
             d.errback(e)
 
     def _call_api_with_creds(self, credentials, api_name):