Merge lp:~thisfred/ubuntuone-couch/lp-781119 into lp:ubuntuone-couch

[Eric Casteleijn]

When no oauth credentials are passed in, *and* none are present in Ubuntu SSO, show a reasonable error message, rather than a python traceback. (LP: #781119)

When no oauth credentials are passed in, *and* none are present in Ubuntu SSO, show a reasonable error message, rather than a python traceback.

[Michael Terry (mterry)]

Yeah, that looks like nicer behavior, thanks.

[Natalia Bidart (nataliabidart)]

review: Approve

[lp:~thisfred/ubuntuone-couch/lp-781119]

16. By Eric Casteleijn on 2011-05-25

error message does not need angle brackets

[dobey (dobey)]

review: Approve

=== modified file 'bin/u1oauthrequest'
--- bin/u1oauthrequest	2011-02-25 22:02:43 +0000
+++ bin/u1oauthrequest	2011-05-25 14:06:03 +0000
@@ -5,6 +5,7 @@
 from ubuntuone.couch import auth
 
 import socket
+import sys
 socket.setdefaulttimeout(5)
 
 if __name__ == "__main__":
@@ -35,9 +36,13 @@
     (OPTIONS, ARGS) = PARSER.parse_args()
     if len(ARGS) != 1:
         PARSER.error("You must specify a url")
-    print auth.request(
+    RESULT = auth.request(
         url=ARGS[0], sigmeth=OPTIONS.sigmeth,
         http_method=OPTIONS.http_method, request_body=OPTIONS.body,
         access_token=OPTIONS.access_token, token_secret=OPTIONS.token_secret,
         consumer_key=OPTIONS.consumer_key,
         consumer_secret=OPTIONS.consumer_secret)
+    print RESULT
+    if RESULT == auth.NO_CREDENTIALS:
+        sys.exit(1)
+

=== modified file 'ubuntuone/couch/auth.py'
--- ubuntuone/couch/auth.py	2011-05-23 21:15:37 +0000
+++ ubuntuone/couch/auth.py	2011-05-25 14:06:03 +0000
@@ -20,6 +20,7 @@
 import ubuntu_sso
 import urlparse
 
+from gettext import gettext as _
 from oauth import oauth
 from dbus.mainloop.glib import DBusGMainLoop
 
@@ -31,6 +32,17 @@
 APP_NAME = "Ubuntu One"
 HMAC_SHA1 = oauth.OAuthSignatureMethod_HMAC_SHA1()
 PLAINTEXT = oauth.OAuthSignatureMethod_PLAINTEXT()
+NO_CREDENTIALS = _('No OAuth credentials passed in or found in Ubuntu SSO.')
+
+
+class CredentialsNotFound(Exception):
+    """Exception for missing data in SSO."""
+
+    def __init__(self, key):            # pylint: disable=W0231
+        self.key = key
+
+    def __str__(self):
+        return "Credentials Not Found Error: missing key %s" % self.key
 
 
 def _undbusify(value):
@@ -64,8 +76,13 @@
     if len(oauth_data) > 0:
         logging.info(
             'get_oauth_data: Got non emtpy credentials from Ubuntu SSO.')
-    return dict([(key, oauth_data[key]) for key in (
-        'consumer_key', 'consumer_secret', 'token', 'token_secret')])
+    credentials = {}
+    for key in ('consumer_key', 'consumer_secret', 'token', 'token_secret'):
+        try:
+            credentials[key] = oauth_data[key]
+        except KeyError:
+            raise CredentialsNotFound(key)
+    return credentials
 
 
 def get_oauth_token(token, secret):
@@ -100,7 +117,11 @@
     else:
         signature_method = HMAC_SHA1
     if access_token is None or consumer_key is None:
-        credentials = get_oauth_credentials()
+        try:
+            credentials = get_oauth_credentials()
+        except CredentialsNotFound, e:
+            logging.error('No credentials found in SSO. %s', e)
+            return NO_CREDENTIALS
         access_token = credentials['token']
         token_secret = credentials['token_secret']
         consumer_key = credentials['consumer_key']

=== modified file 'ubuntuone/tests/test_auth.py'
--- ubuntuone/tests/test_auth.py	2011-05-24 17:24:43 +0000
+++ ubuntuone/tests/test_auth.py	2011-05-25 14:06:03 +0000
@@ -23,7 +23,7 @@
 
 from ubuntuone.couch.auth import (
     APP_NAME, HMAC_SHA1, get_oauth_request_header, get_oauth_credentials,
-    get_oauth_token, request)
+    get_oauth_token, request, CredentialsNotFound, NO_CREDENTIALS)
 
 CONSUMER_KEY = u'this_consumer_key'
 CONSUMER_SECRET = u'sssssh!'
@@ -128,6 +128,16 @@
         result = request('https://something.one.ubuntu.com/')
         self.assertEquals(fake_result, result)
 
+    def test_request_no_oauth_credentials(self):
+        """Test a request with no oauth credentials in SSO."""
+        mock_get_oauth_credentials = self.mocker.replace(
+            'ubuntuone.couch.auth.get_oauth_credentials')
+        mock_get_oauth_credentials()
+        self.mocker.throw(CredentialsNotFound('consumer_key'))
+        self.mocker.replay()
+        result = request('https://something.one.ubuntu.com/')
+        self.assertEquals(NO_CREDENTIALS, result)
+
     def test_request_plaintext(self):
         """Test a full request."""
         mock_get_oauth_credentials = self.mocker.replace(