Merge lp:~facundo/ubuntuone-client/discriminate-auth-error into lp:ubuntuone-client

[Facundo Batista]

Distinguish between Auth failure and other errors.

[Facundo Batista (facundo)]

Distinguish between Auth failure and other errors.

Now, we only go to AUTH_ERROR state if the Auth effectively failed; if something else happens, we go to unknown error, not provoking the applet to drop the token.

Here are snippets of the log for each situation, tested IRL with this changes (and lp:~facundo/ubuntuone-storage-protocol/discriminate_auth_error also applied):

Authentication OK:

  State - DEBUG - START_SET_CAPABILITIES --[SYS_SET_CAPABILITIES_OK]--> START_AUTHENTICATING
  EQ - DEBUG - push_event: SYS_STATE_CHANGED, args:(), kw:{'state': <NonActiveConnectedSDState START_AUTHENTICATING>}
  ActionQueue - INFO - Oauth OK
  EQ - DEBUG - push_event: SYS_OAUTH_OK, args:(), kw:{}

Authentication FAIL:

  State - DEBUG - START_SET_CAPABILITIES_WITH_METAQ --[SYS_SET_CAPABILITIES_OK]--> START_AUTHENTICATING_WITH_METAQ
  EQ - DEBUG - push_event: SYS_STATE_CHANGED, args:(), kw:{'state': <SyncDaemonState START_AUTHENTICATING_WITH_METAQ>}
  ActionQueue - ERROR - OAuth failed: AUTHENTICATION_FAILED
  EQ - DEBUG - push_event: SYS_OAUTH_ERROR, args:(), kw:{'error': 'AUTHENTICATION_FAILED'}
  State - DEBUG - Event arrived: cancelling timeout watchdog
  ActionQueue - DEBUG - disconnected
  State - DEBUG - START_AUTHENTICATING_WITH_METAQ --[SYS_OAUTH_ERROR]--> AUTH_FAILED
  EQ - DEBUG - push_event: SYS_STATE_CHANGED, args:(), kw:{'state': <AQErrorState AUTH_FAILED>}

Server answered INTERNAL_ERROR:

  State - DEBUG - START_SET_CAPABILITIES_WITH_METAQ --[SYS_SET_CAPABILITIES_OK]--> START_AUTHENTICATING_WITH_METAQ
  EQ - DEBUG - push_event: SYS_STATE_CHANGED, args:(), kw:{'state': <SyncDaemonState START_AUTHENTICATING_WITH_METAQ>}
  ActionQueue - ERROR - StorageRequestError during OAuth: INTERNAL_ERROR
  EQ - DEBUG - push_event: SYS_UNKNOWN_ERROR, args:(), kw:{}
  State - DEBUG - Event arrived: cancelling timeout watchdog
  EQ - DEBUG - push_event: SYS_DISCONNECT, args:(), kw:{}
  HQ - INFO - HashQueue: _hasher stopped
  DBus - INFO - Shuttingdown DBusInterface!
  ActionQueue - DEBUG - disconnected
  State - DEBUG - START_AUTHENTICATING_WITH_METAQ --[SYS_UNKNOWN_ERROR]--> UNKNOWN_ERROR
  EQ - DEBUG - push_event: SYS_STATE_CHANGED, args:(), kw:{'state': <AQErrorState UNKNOWN_ERROR>}

[John Lenton (chipaca)]

Awesome.

review: Approve

[dobey (dobey)]

review: Approve

=== modified file 'ubuntuone/syncdaemon/action_queue.py'
--- ubuntuone/syncdaemon/action_queue.py	2009-10-09 08:19:05 +0000
+++ ubuntuone/syncdaemon/action_queue.py	2009-10-16 17:10:21 +0000
@@ -44,7 +44,7 @@
 
 from oauth import oauth
 from ubuntuone.storageprotocol.context import get_ssl_context
-from ubuntuone.storageprotocol import protocol_pb2
+from ubuntuone.storageprotocol import protocol_pb2, request
 from ubuntuone.storageprotocol.client import ThrottlingStorageClient, \
     ThrottlingStorageClientFactory
 from ubuntuone.syncdaemon.logger import mklog, TRACE
@@ -975,11 +975,22 @@
         client = self.client
         try:
             yield client.oauth_authenticate(oauth_consumer, self.token)
+        except request.StorageRequestError, e:
+            if client is not self.client:
+                return
+            if e.error_message.error.type == \
+                                    protocol_pb2.Error.AUTHENTICATION_FAILED:
+                logger.error("OAuth failed: %s", e)
+                self.event_queue.push('SYS_OAUTH_ERROR', error=str(e))
+            else:
+                logger.error("StorageRequestError during OAuth: %s", e)
+                self.event_queue.push('SYS_UNKNOWN_ERROR')
+            self.deferred.callback(Failure(e))
         except Exception, e:
             if client is not self.client:
                 return
-            logger.error("OAuth failed: %s", e.message)
-            self.event_queue.push('SYS_OAUTH_ERROR', error=e.message)
+            logger.error("Generic error during OAuth: %s", e)
+            self.event_queue.push('SYS_UNKNOWN_ERROR')
             self.deferred.callback(Failure(e))
         else:
             if client is not self.client: