Merge lp:~nataliabidart/desktopcouch/no-hard-coded-consumer into lp:desktopcouch

[Natalia Bidart]

* Replication for Ubuntu One needs to get credentials from Ubuntu SSO (LP: #649320).

[Chad Miller (cmiller)]

no-hard-coded-consumer$ PYTHONPATH=`pwd` bin/desktopcouch-service
WARNING:root:Starting up personal couchdb.
Removing stale, deceptive pid file.
Apache CouchDB has started, time to relax.
Browse your desktop CouchDB at file:///home/cmiller/.local/share/desktop-couch/couchdb.html
DEBUG:root:starting dbus main loop
INFO:root:Connecting to http://localhost:57539/.
INFO:root:Connecting to http://localhost:57539/.
DEBUG:root:found 1 self_identity records
INFO:LocationAdvertisement:starting advertising _couchdb_location._tcp on port 57539
DEBUG:replication:started replicating
INFO:root:Connecting to http://localhost:57539/.
DEBUG:replication:replication of discovered hosts finished
INFO:root:Connecting to http://localhost:57539/.
DEBUG:root:static pairings are [('fd98a23e-4fb3-410c-9146-4dee15d40d05', 'ubuntuone', True, True)]
DEBUG:replication:Looking up prefix for service 'ubuntuone'
DEBUG:replication:Looking up prefix for service 'ubuntuone'
ERROR:root:Could not get access token from sso.
Traceback (most recent call last):
  File "/home/cmiller/work/canonical/desktopcouch/no-hard-coded-consumer/desktopcouch/replication_services/ubuntuone.py", line 86, in __str__
    consumer = oauth.OAuthConsumer(oauth_data['consumer_key'],
TypeError: 'NoneType' object is unsubscriptable
replication 2010-09-27 17:16:27,321 - Could not get access token from sso.
Traceback (most recent call last):
  File "/home/cmiller/work/canonical/desktopcouch/no-hard-coded-consumer/desktopcouch/replication_services/ubuntuone.py", line 86, in __str__
    consumer = oauth.OAuthConsumer(oauth_data['consumer_key'],
TypeError: 'NoneType' object is unsubscriptable
WARNING:replication:Can't reach service ubuntuone. No access token.
replication 2010-09-27 17:16:27,323 - Can't reach service ubuntuone. No access token.
DEBUG:replication:finished replicating
DEBUG:root:starting replicator main loop
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/dbus/connection.py", line 576, in msg_reply_handler
    reply_handler(*message.get_args_list(**get_args_opts))
  File "/usr/lib/pymodules/python2.6/dbus/proxies.py", line 391, in _introspect_reply_handler
    self._introspect_execute_queue()
  File "/usr/lib/pymodules/python2.6/dbus/proxies.py", line 378, in _introspect_execute_queue
    proxy_method(*args, **keywords)
  File "/usr/lib/pymodules/python2.6/dbus/proxies.py", line 132, in __call__
    **keywords)
TypeError: call_async() got an unexpected keyword argument 'bus_interface'
Traceback (most recent call last):
  File "/usr/lib/pymodules/python2.6/dbus/connection.py", line 576, in msg_reply_handler
    reply_handler(*message.get_args_list(**get_args_opts))
  File "/usr/lib/pymodules/python2.6/dbus/proxies.py", line 391, in _introspect_reply_handler
    self._introspect_execute_queue()
  File "/usr/lib/pymodules/python2.6/dbus/proxies.py", line 378, in _introspect_execute_queue
    proxy_method(*args, **keywords)
  File "/usr/lib/pymodules/python2.6/dbus/proxies.py", line 132, in __call__
    **keywords)
TypeError: call_async() got an unexpected keyword argument 'bus_interface'

review: Needs Fixing

[Eric Casteleijn (thisfred)]

I get a different error on lucid, but that may be because desktopcouch trunk is not meant to work there:

INFO:root:Connecting to http://localhost:36900/.
DEBUG:root:starting dbus main loop
INFO:root:Connecting to http://localhost:36900/.
DEBUG:root:found 1 self_identity records
INFO:LocationAdvertisement:starting advertising _couchdb_location._tcp on port 36900
DEBUG:replication:started replicating
INFO:root:Connecting to http://localhost:36900/.
DEBUG:replication:replication of discovered hosts finished
INFO:root:Connecting to http://localhost:36900/.
DEBUG:root:static pairings are [('5c4829ed-d0ca-4c7e-ac59-68a79626bd44', 'ubuntuone', True, True)]
DEBUG:replication:Looking up prefix for service 'ubuntuone'
ERROR:replication:replication of services aborted
Traceback (most recent call last):
  File "/home/eric/canonical/desktopcouch/no-hard-coded-consumer/desktopcouch/replication.py", line 140, in do_all_replication
    remote_oauth_data = oauth_info_for_service(sn)
  File "/home/eric/canonical/desktopcouch/no-hard-coded-consumer/desktopcouch/replication.py", line 64, in oauth_info_for_service
    return getattr(mod, service_name).get_oauth_data()
  File "/home/eric/canonical/desktopcouch/no-hard-coded-consumer/desktopcouch/replication_services/ubuntuone.py", line 49, in get_oauth_data
    proxy = bus.get_object(ubuntu_sso.DBUS_BUS_NAME,
AttributeError: 'module' object has no attribute 'DBUS_BUS_NAME'
replication 2010-09-27 17:23:26,439 - replication of services aborted
Traceback (most recent call last):
  File "/home/eric/canonical/desktopcouch/no-hard-coded-consumer/desktopcouch/replication.py", line 140, in do_all_replication
    remote_oauth_data = oauth_info_for_service(sn)
  File "/home/eric/canonical/desktopcouch/no-hard-coded-consumer/desktopcouch/replication.py", line 64, in oauth_info_for_service
    return getattr(mod, service_name).get_oauth_data()
  File "/home/eric/canonical/desktopcouch/no-hard-coded-consumer/desktopcouch/replication_services/ubuntuone.py", line 49, in get_oauth_data
    proxy = bus.get_object(ubuntu_sso.DBUS_BUS_NAME,
AttributeError: 'module' object has no attribute 'DBUS_BUS_NAME'

[Natalia Bidart (nataliabidart)]

Errors should be fixed now.

[Chad Miller (cmiller)]

I removed keys from gnomekeyring/seahorse. I then started desktopcouch-service, and got empty dicts back for tokens. Those were accessed around line 79 of desktopcouch/replication_services/ubuntuone.py for some key. That fails, so stops replication with a message in the log. Not a big deal.

I then started up syncdaemon, and reauthorized myself. I changed my DNS resolver to use prod (instead of staging), and got ServerError: (503, '') .

thisfred still works on the server end.

[Chad Miller (cmiller)]

Aside from the minor ugliness of the KeyError on lin 79, this looks good to me.

review: Approve

[dobey (dobey)]

The attempt to merge lp:~nataliabidart/desktopcouch/no-hard-coded-consumer into lp:desktopcouch failed. Below is the output from the failed tests.

running build
running build_py
creating build
creating build/lib.linux-i686-2.6
creating build/lib.linux-i686-2.6/desktopcouch
copying desktopcouch/stop_local_couchdb.py -> build/lib.linux-i686-2.6/desktopcouch
copying desktopcouch/start_local_couchdb.py -> build/lib.linux-i686-2.6/desktopcouch
copying desktopcouch/replication.py -> build/lib.linux-i686-2.6/desktopcouch
copying desktopcouch/local_files.py -> build/lib.linux-i686-2.6/desktopcouch
copying desktopcouch/__init__.py -> build/lib.linux-i686-2.6/desktopcouch
creating build/lib.linux-i686-2.6/desktopcouch/tests
copying desktopcouch/tests/test_start_local_couchdb.py -> build/lib.linux-i686-2.6/desktopcouch/tests
copying desktopcouch/tests/test_local_files.py -> build/lib.linux-i686-2.6/desktopcouch/tests
copying desktopcouch/tests/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/tests
copying desktopcouch/tests/test_replication.py -> build/lib.linux-i686-2.6/desktopcouch/tests
creating build/lib.linux-i686-2.6/desktopcouch/tasks
copying desktopcouch/tasks/record.py -> build/lib.linux-i686-2.6/desktopcouch/tasks
copying desktopcouch/tasks/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/tasks
creating build/lib.linux-i686-2.6/desktopcouch/pair
copying desktopcouch/pair/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/pair
creating build/lib.linux-i686-2.6/desktopcouch/records
copying desktopcouch/records/field_registry.py -> build/lib.linux-i686-2.6/desktopcouch/records
copying desktopcouch/records/record.py -> build/lib.linux-i686-2.6/desktopcouch/records
copying desktopcouch/records/server.py -> build/lib.linux-i686-2.6/desktopcouch/records
copying desktopcouch/records/couchgrid.py -> build/lib.linux-i686-2.6/desktopcouch/records
copying desktopcouch/records/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/records
copying desktopcouch/records/server_base.py -> build/lib.linux-i686-2.6/desktopcouch/records
creating build/lib.linux-i686-2.6/desktopcouch/replication_services
copying desktopcouch/replication_services/ubuntuone.py -> build/lib.linux-i686-2.6/desktopcouch/replication_services
copying desktopcouch/replication_services/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/replication_services
copying desktopcouch/replication_services/example.py -> build/lib.linux-i686-2.6/desktopcouch/replication_services
creating build/lib.linux-i686-2.6/desktopcouch/notes
copying desktopcouch/notes/record.py -> build/lib.linux-i686-2.6/desktopcouch/notes
copying desktopcouch/notes/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/notes
creating build/lib.linux-i686-2.6/desktopcouch/bookmarks
copying desktopcouch/bookmarks/record.py -> build/lib.linux-i686-2.6/desktopcouch/bookmarks
copying desktopcouch/bookmarks/__init__.py -> build/lib.linux-i686-2.6/desktopcouch/bookmarks
creating build/lib.linux-i686-2.6/desktopcouch/contacts
copying desktopcouch/contacts/record.py -> build/lib.linux-i686-2.6/desktopcouch/contacts
copying desktopcouch/contacts/view.py -> build/lib.linux-i686-2.6/desktopcouch/contacts
copying desktopcouch/co...

=== modified file 'desktopcouch/replication_services/ubuntuone.py'
--- desktopcouch/replication_services/ubuntuone.py	2010-04-13 02:44:20 +0000
+++ desktopcouch/replication_services/ubuntuone.py	2010-09-27 21:59:39 +0000
@@ -1,7 +1,9 @@
 from oauth import oauth
 import logging
 import httplib2
-import gnomekeyring
+
+import dbus
+import ubuntu_sso
 
 try:
     # Python 2.5
@@ -14,8 +16,6 @@
 name = "Ubuntu One"
 description = "The Ubuntu One cloud service"
 
-oauth_consumer_key = "ubuntuone"
-oauth_consumer_secret = "hammertime"
 
 def in_main_thread(function, *args, **kwargs):
     from twisted.python.threadable import isInIOThread
@@ -37,50 +37,17 @@
     if oauth_data is not None:
         return oauth_data
 
-    try:
-        matches = in_main_thread(gnomekeyring.find_items_sync,
-            gnomekeyring.ITEM_GENERIC_SECRET,
-            {'ubuntuone-realm': "https://ubuntuone.com",
-             'oauth-consumer-key': oauth_consumer_key})
-        if matches:
-            # parse "a=b&c=d" to {"a":"b","c":"d"}
-            kv_list = [x.split("=", 1) for x in matches[0].secret.split("&")]
-            keys, values = zip(*kv_list)
-            keys = [k.replace("oauth_", "") for k in keys]
-            oauth_data = dict(zip(keys, values))
-            oauth_data.update({
-                "consumer_key": oauth_consumer_key,
-                "consumer_secret": oauth_consumer_secret,
-            })
-            return oauth_data
-    except ImportError, e:
-        logging.info("Can't replicate to Ubuntu One cloud without credentials."
-                " %s", e)
-    except gnomekeyring.NoMatchError:
-        logging.info("This machine hasn't authorized itself to Ubuntu One; "
-                "replication to the cloud isn't possible until it has.  See "
-                "'ubuntuone-client-applet'.")
-    except gnomekeyring.NoKeyringDaemonError:
-        logging.error("No keyring daemon found in this session, so we have "
-                "no access to Ubuntu One data.")
-    except gnomekeyring.CancelledError:
-        logging.error("User cancelled the keyring dialog. We have no access.")
+    bus = dbus.SessionBus()
+    proxy = bus.get_object(ubuntu_sso.DBUS_BUS_NAME,
+                           ubuntu_sso.DBUS_CRED_PATH,
+                           follow_name_owner_changes=True)
+    logging.info('get_oauth_data: asking for credentials to Ubuntu SSO. '
+                 'App name: %s', name)
+    oauth_data = proxy.find_credentials(name)
+    logging.info('Got credentials from Ubuntu SSO. Non emtpy credentials? %s',
+                 len(oauth_data) > 0)
+    return oauth_data
 
-def get_oauth_token(consumer):
-    """Get the token from the keyring"""
-    try:
-        items = in_main_thread(gnomekeyring.find_items_sync,
-            gnomekeyring.ITEM_GENERIC_SECRET,
-            {'ubuntuone-realm': "https://one.ubuntu.com",
-             'oauth-consumer-key': consumer.key})
-    except gnomekeyring.NoMatchError:
-        logging.info("No o.u.c key.  Maybe there's uo.c key?")
-        items = in_main_thread(gnomekeyring.find_items_sync,
-            gnomekeyring.ITEM_GENERIC_SECRET,
-            {'ubuntuone-realm': "https://ubuntuone.com",
-             'oauth-consumer-key': consumer.key})
-    if len(items):
-        return oauth.OAuthToken.from_string(items[0].secret)
 
 def get_oauth_request_header(consumer, access_token, http_url):
     """Get an oauth request header given the token and the url"""
@@ -107,17 +74,17 @@
 
         url = "https://one.ubuntu.com/api/account/"
         if self.oauth_header is None:
-            consumer = oauth.OAuthConsumer(oauth_consumer_key,
-                    oauth_consumer_secret)
             try:
-                access_token = get_oauth_token(consumer)
-            except gnomekeyring.NoKeyringDaemonError:
-                logging.info("No keyring daemon is running for this session.")
-                raise ValueError("No keyring access")
-            if not access_token:
-                logging.info("Could not get access token from keyring")
-                raise ValueError("No keyring access")
-            self.oauth_header = get_oauth_request_header(
+                get_oauth_data()
+                consumer = oauth.OAuthConsumer(oauth_data['consumer_key'],
+                                               oauth_data['consumer_secret'])
+                access_token = oauth.OAuthToken(oauth_data['token'],
+                                                oauth_data['token_secret'])
+            except:
+                logging.exception("Could not get access token from sso.")
+                raise ValueError("No access token.")
+
+        self.oauth_header = get_oauth_request_header(
                 consumer, access_token, url)
 
         client = httplib2.Http()