Ubuntu One Client

Merge lp:~verterok/ubuntuone-client/sd-do-oauth into lp:ubuntuone-client

  1. sd-do-oauth
  2. Merge into trunk
Proposed by Guillermo Gonzalez
Status: Merged
Approved by: dobey
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~verterok/ubuntuone-client/sd-do-oauth
Merge into: lp:ubuntuone-client
Diff against target: 384 lines (+243/-12)
4 files modified
contrib/testing/testcase.py (+64/-5)
tests/syncdaemon/test_dbus.py (+113/-1)
tests/syncdaemon/test_fsm.py (+2/-1)
ubuntuone/syncdaemon/dbus_interface.py (+64/-5)
To merge this branch: bzr merge lp:~verterok/ubuntuone-client/sd-do-oauth
Reviewer Review Type Date Requested Status
dobey (community) Approve
John O'Brien (community) Approve
Review via email: mp+15775@code.launchpad.net

Commit message

Use oauthdesktop in syncdaemon to request a token if we haven't already got one.

To post a comment you must log in.
Revision history for this message
Guillermo Gonzalez (verterok) wrote :

This branch adds support for oauthdesktop to syncdaemon.
e.g: If there is no token in the keyring, syncdaemon will call oauthdesktop to get the token, and listen for the oauthdesktop DBus signals.

Revision history for this message
John O'Brien (jdobrien) wrote :

works great.

review: Approve
Revision history for this message
dobey (dobey) wrote :

I get this when doing make check. I'm not sure why though, as I'm running it as me.

rm: cannot remove directory `_trial_temp/tmp/tests.syncdaemon.test_tools/TestToolsBasic/test_accept_share/tmpdir/shares_dir/share': Permission denied
rm: cannot remove directory `_trial_temp/tmp/tests.syncdaemon.test_dbus/DBusInterfaceTests/test_accept_share/tmpdir/shares_dir/share': Permission denied
make: *** [check] Error 1

review: Needs Fixing
Revision history for this message
dobey (dobey) wrote :

I get this when doing make check. It looks like for some reason the "share" directory here isn't writable by me.

rm: cannot remove directory `_trial_temp/tmp/tests.syncdaemon.test_tools/TestToolsBasic/test_accept_share/tmpdir/shares_dir/share': Permission denied
rm: cannot remove directory `_trial_temp/tmp/tests.syncdaemon.test_dbus/DBusInterfaceTests/test_accept_share/tmpdir/shares_dir/share': Permission denied
make: *** [check] Error 1

review: Needs Fixing
lp:~verterok/ubuntuone-client/sd-do-oauth updated
285. By Guillermo Gonzalez

fix tests tearDown

Revision history for this message
Guillermo Gonzalez (verterok) wrote :

Fixed and pushed.

Thanks

Revision history for this message
dobey (dobey) wrote :

Now I'm intermittently getting the following failure:

[FAIL]: tests.syncdaemon.test_fsm.FileHandlingTests.test_warning_on_log_file_when_failing_delete

Traceback (most recent call last):
  File "/usr/lib/python2.6/unittest.py", line 279, in run
    testMethod()
  File "/home/dobey/Projects/canonical/ubuntuone-client/sd-do-oauth/tests/syncdaemon/test_fsm.py", line 1909, in test_warning_on_log_file_when_failing_delete
    self.assertTrue(log_present)
exceptions.AssertionError:
-------------------------------------------------------------------------------
Ran 4499 tests in 81.800s

Revision history for this message
Guillermo Gonzalez (verterok) wrote :

Hi,
That test is unrelated to my changes.
I'll file a bug about it and skip the test.

On Dec 8, 2009 4:01 PM, "Rodney Dawes" <email address hidden> wrote:

Now I'm intermittently getting the following failure:

[FAIL]:
tests.syncdaemon.test_fsm.FileHandlingTests.test_warning_on_log_file_when_failing_delete

Traceback (most recent call last):
 File "/usr/lib/python2.6/unittest.py", line 279, in run
   testMethod()
 File
"/home/dobey/Projects/canonical/ubuntuone-client/sd-do-oauth/tests/syncdaemon/test_fsm.py",
line 1909, in test_warning_on_log_file_when_failing_delete
   self.assertTrue(log_present)
exceptions.AssertionError:
-------------------------------------------------------------------------------
Ran 4499 tests in 81.800s

--
https://code.edge.launchpad.net/~verterok/ubuntuone-client/sd-do-oauth/+merge/15775

You are the owner of lp:~verterok/ubuntuone-client/sd-do-oauth.

Revision history for this message
Guillermo Gonzalez (verterok) wrote :

Hi, Bug #494469 filed and assigned.

Thanks

lp:~verterok/ubuntuone-client/sd-do-oauth updated
286. By Guillermo Gonzalez

skip test_warning_on_log_file_when_failing_delete, Bug #494469

Revision history for this message
dobey (dobey) wrote :

OK. Looks like the test isn't failing now, and several runs all passed, so I'll go ahead and Approve. Thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'contrib/testing/testcase.py'
--- contrib/testing/testcase.py 2009-10-14 18:38:59 +0000
+++ contrib/testing/testcase.py 2009-12-09 15:01:13 +0000
@@ -23,7 +23,7 @@
23import os23import os
24import shutil24import shutil
2525
2626from ubuntuone.oauthdesktop.main import Login, LoginProcessor
27from ubuntuone.syncdaemon import (27from ubuntuone.syncdaemon import (
28 config,28 config,
29 action_queue,29 action_queue,
@@ -38,10 +38,12 @@
38 DBusExposedObject,38 DBusExposedObject,
39 NM_STATE_CONNECTED,39 NM_STATE_CONNECTED,
40 NM_STATE_DISCONNECTED,40 NM_STATE_DISCONNECTED,
41 DBUS_IFACE_AUTH_NAME,
41)42)
42from twisted.internet import defer43from twisted.internet import defer
43from twisted.trial.unittest import TestCase as TwistedTestCase44from twisted.trial.unittest import TestCase as TwistedTestCase
44from zope.interface import implements45from zope.interface import implements
46from oauth import oauth
4547
46class FakeOAuthClient(object):48class FakeOAuthClient(object):
47 """ Fake OAuthClient"""49 """ Fake OAuthClient"""
@@ -49,7 +51,7 @@
49 def __init__(self, realm):51 def __init__(self, realm):
50 """ create the instance. """52 """ create the instance. """
51 self.realm = realm53 self.realm = realm
52 self.consumer = 'ubuntuone'54 self.consumer = oauth.OAuthConsumer('ubuntuone', 'hammertime')
5355
54 def get_access_token(self):56 def get_access_token(self):
55 """ returns a Token"""57 """ returns a Token"""
@@ -253,7 +255,7 @@
253255
254 def tearDown(self):256 def tearDown(self):
255 """ Cleanup the test. """257 """ Cleanup the test. """
256 d = self.cleanup_signal_receivers()258 d = self.cleanup_signal_receivers(self.signal_receivers)
257 d.addBoth(self._tearDown)259 d.addBoth(self._tearDown)
258 d.addBoth(lambda _: BaseTwistedTestCase.tearDown(self))260 d.addBoth(lambda _: BaseTwistedTestCase.tearDown(self))
259 return d261 return d
@@ -276,10 +278,10 @@
276 """ default error handler for DBus calls. """278 """ default error handler for DBus calls. """
277 self.fail(error)279 self.fail(error)
278280
279 def cleanup_signal_receivers(self):281 def cleanup_signal_receivers(self, signal_receivers):
280 """ cleanup self.signal_receivers and returns a deferred """282 """ cleanup self.signal_receivers and returns a deferred """
281 deferreds = []283 deferreds = []
282 for match in self.signal_receivers:284 for match in signal_receivers:
283 d = defer.Deferred()285 d = defer.Deferred()
284 def callback(*args):286 def callback(*args):
285 """ callback that accepts *args. """287 """ callback that accepts *args. """
@@ -305,6 +307,7 @@
305 """ Creates the instance """307 """ Creates the instance """
306 self.eq = self.event_queue = eq308 self.eq = self.event_queue = eq
307 self.client = action_queue.ActionQueueProtocol()309 self.client = action_queue.ActionQueueProtocol()
310 self.client.disconnect = lambda: None
308 self.uploading = {}311 self.uploading = {}
309 self.downloading = {}312 self.downloading = {}
310 # pylint: disable-msg=C0103313 # pylint: disable-msg=C0103
@@ -482,3 +485,59 @@
482 """485 """
483 Do nothing486 Do nothing
484 """487 """
488
489# OAuth stubs
490class FakeLoginProcessor(LoginProcessor):
491 """Stub login processor."""
492
493 def __init__(self, dbus_object):
494 """Initialize the login processor."""
495 LoginProcessor.__init__(self, dbus_object, use_libnotify=False)
496 self.next_login_cb = None
497
498 def login(self, realm, consumer_key, error_handler=None, reply_handler=None, do_login=True):
499 """Stub, call self.next_login_cb or send NewCredentials if
500 self.next_login_cb isn't defined.
501 """
502 self.realm = str(realm)
503 self.consumer_key = str(consumer_key)
504 if self.next_login_cb:
505 cb = self.next_login_cb[0]
506 args = self.next_login_cb[1]
507 self.next_login_cb = None
508 return cb(*args)
509 else:
510 self.dbus_object.NewCredentials(realm, consumer_key)
511
512 def clear_token(self, realm, consumer_key):
513 """Stub, do nothing"""
514 pass
515
516 def next_login_with(self, callback, args=tuple()):
517 """shortcircuit the next call to login and call the specified callback.
518 callback is usually one of: self.got_token, self.got_no_token,
519 self.got_denial or self.got_error.
520 """
521 self.next_login_cb = (callback, args)
522
523
524class FakeLogin(Login):
525 """Stub Object which listens for D-Bus OAuth requests"""
526
527 def __init__(self, bus):
528 """Initiate the object."""
529 self.bus = bus
530 self.busName = dbus.service.BusName(DBUS_IFACE_AUTH_NAME, bus=self.bus)
531 # bypass the parent class __init__ as it has the path hardcoded
532 # and we can't use '/' as the path, as we are already using it
533 # for syncdaemon. pylint: disable-msg=W0233,W0231
534 dbus.service.Object.__init__(self, object_path="/oauthdesktop",
535 bus_name=self.busName)
536 self.processor = FakeLoginProcessor(self)
537 self.currently_authing = False
538
539 def shutdown(self):
540 """Shutdown and remove any trace from the bus"""
541 self.busName.get_bus().release_name(self.busName.get_name())
542 self.remove_from_connection()
543
485544
=== modified file 'tests/syncdaemon/test_dbus.py'
--- tests/syncdaemon/test_dbus.py 2009-11-20 22:00:25 +0000
+++ tests/syncdaemon/test_dbus.py 2009-12-09 15:01:13 +0000
@@ -24,6 +24,7 @@
24from ubuntuone.storageprotocol.sharersp import (24from ubuntuone.storageprotocol.sharersp import (
25 NotifyShareHolder,25 NotifyShareHolder,
26)26)
27from ubuntuone.syncdaemon import dbus_interface
27from ubuntuone.syncdaemon.dbus_interface import (28from ubuntuone.syncdaemon.dbus_interface import (
28 DBUS_IFACE_STATUS_NAME,29 DBUS_IFACE_STATUS_NAME,
29 DBUS_IFACE_EVENTS_NAME,30 DBUS_IFACE_EVENTS_NAME,
@@ -36,9 +37,10 @@
36from ubuntuone.syncdaemon.volume_manager import Share37from ubuntuone.syncdaemon.volume_manager import Share
37from ubuntuone.syncdaemon.tools import DBusClient38from ubuntuone.syncdaemon.tools import DBusClient
38from ubuntuone.syncdaemon import event_queue39from ubuntuone.syncdaemon import event_queue
39from ubuntuone.syncdaemon import states40from ubuntuone.syncdaemon import states, main
40from contrib.testing.testcase import (41from contrib.testing.testcase import (
41 DBusTwistedTestCase,42 DBusTwistedTestCase,
43 FakeLogin,
42)44)
43from twisted.internet import defer45from twisted.internet import defer
44from ubuntuone.syncdaemon.marker import MDMarker46from ubuntuone.syncdaemon.marker import MDMarker
@@ -1297,6 +1299,116 @@
1297 return d1299 return d
12981300
12991301
1302class TestDBusOAuth(DBusTwistedTestCase):
1303 """Tests the interaction between dbus_interface and oauthdesktop"""
1304
1305 def setUp(self):
1306 DBusTwistedTestCase.setUp(self)
1307 self.oauth = FakeLogin(self.bus)
1308 self._old_path = dbus_interface.DBUS_PATH_AUTH
1309 dbus_interface.DBUS_PATH_AUTH = '/oauthdesktop'
1310
1311 def tearDown(self):
1312 # collect all signal receivers registered during the test
1313 signal_receivers = set()
1314 with self.bus._signals_lock:
1315 for group in self.bus._signal_recipients_by_object_path.values():
1316 for matches in group.values():
1317 for match in matches.values():
1318 signal_receivers.update(match)
1319 d = self.cleanup_signal_receivers(signal_receivers)
1320 def shutdown(r):
1321 self.oauth.shutdown()
1322 dbus_interface.DBUS_PATH_AUTH = self._old_path
1323 d.addCallback(shutdown)
1324 d.addCallback(lambda _: DBusTwistedTestCase.tearDown(self))
1325 return d
1326
1327 def test_new_credentials_signal(self):
1328 """NewCredentials signal test"""
1329 self.oauth.processor.next_login_with(self.oauth.processor.got_token,
1330 ('my_token',))
1331 d = self.dbus_iface._request_token()
1332 def check(info):
1333 realm, key = info
1334 expected = (u'http://test.ubuntuone.com', u'ubuntuone')
1335 self.assertEquals((realm, key), expected)
1336 d.addCallbacks(check, self.fail)
1337 return d
1338
1339 def test_no_credentials_signal(self):
1340 """NoCredentials signal test"""
1341 self.oauth.processor.next_login_with(self.oauth.processor.got_no_token)
1342 d = self.dbus_iface._request_token()
1343 def check(f):
1344 self.assertEquals(f.getErrorMessage(), 'NoCredentials')
1345 d.addCallbacks(self.fail, check)
1346 return d
1347
1348 def test_auth_denied_signal(self):
1349 """AuthorizationDenied signal test"""
1350 self.oauth.processor.next_login_with(self.oauth.processor.got_denial)
1351 d = self.dbus_iface._request_token()
1352 def check(f):
1353 self.assertEquals(f.getErrorMessage(), 'AuthorizationDenied')
1354 d.addCallbacks(self.fail, check)
1355 return d
1356
1357 def test_oauth_error_signal(self):
1358 """OAuthError signal test"""
1359 self.oauth.processor.next_login_with(self.oauth.processor.got_error,
1360 ('error!',))
1361 d = self.dbus_iface._request_token()
1362 def check(f):
1363 self.assertEquals(f.getErrorMessage(), 'OAuthError: error!')
1364 d.addCallbacks(self.fail, check)
1365 return d
1366
1367 def test_connect_without_token(self):
1368 """Test connecting without having a token"""
1369 # replace the get_access_token method in Main
1370 def get_access_token():
1371 raise main.NoAccessToken('no token')
1372 self.main.get_access_token = get_access_token
1373 self.dbus_iface.disconnect()
1374 self.oauth.processor.next_login_with(self.oauth.processor.got_token,
1375 ('the token',))
1376 d = self.dbus_iface.connect()
1377 def check(result):
1378 self.assertEquals(result, None)
1379 d.addCallbacks(check, self.fail)
1380 return d
1381
1382 def test_connect_with_token(self):
1383 """Test connecting with a token"""
1384 self.dbus_iface.disconnect()
1385 self.oauth.processor.next_login_with(self.oauth.processor.got_token,
1386 ('the token',))
1387 d = self.dbus_iface.connect()
1388 # check that the deferred was fired
1389 self.assertEquals(d.called, True)
1390 self.assertEquals(d.result, None)
1391 d.addCallbacks(lambda r: self.assertEquals(r, None), self.fail)
1392 return d
1393
1394 def test_error_on_login(self):
1395 """Test connecting without having a token and getting an error in the
1396 call to oauthdesktop login().
1397 """
1398 # replace the get_access_token method in Main
1399 def get_access_token():
1400 raise main.NoAccessToken('no token')
1401 self.main.get_access_token = get_access_token
1402 self.dbus_iface.disconnect()
1403 def broken_login(*args):
1404 raise ValueError('oops, login is broken!')
1405 self.oauth.processor.next_login_with(broken_login)
1406 d = self.dbus_iface.connect()
1407 def check(result):
1408 self.assertIn('ValueError: oops, login is broken!', result.getErrorMessage())
1409 d.addCallbacks(self.fail, check)
1410 return d
1411
13001412
1301def test_suite():1413def test_suite():
1302 # pylint: disable-msg=C01111414 # pylint: disable-msg=C0111
13031415
=== modified file 'tests/syncdaemon/test_fsm.py'
--- tests/syncdaemon/test_fsm.py 2009-12-01 20:46:11 +0000
+++ tests/syncdaemon/test_fsm.py 2009-12-09 15:01:13 +0000
@@ -1888,7 +1888,8 @@
1888 log_present = 'OSError [Errno 39] Directory not empty' in log_content1888 log_present = 'OSError [Errno 39] Directory not empty' in log_content
1889 self.assertFalse(log_present)1889 self.assertFalse(log_present)
18901890
1891 def test_warning_on_log_file_when_failing_delete(self):1891 # FIXME: Bug #494469
1892 def SKIP_test_warning_on_log_file_when_failing_delete(self):
1892 """Test that sucessfully deleted dir does not log OSError."""1893 """Test that sucessfully deleted dir does not log OSError."""
18931894
1894 log = open(LOGFILENAME, 'r')1895 log = open(LOGFILENAME, 'r')
18951896
=== modified file 'ubuntuone/syncdaemon/dbus_interface.py'
--- ubuntuone/syncdaemon/dbus_interface.py 2009-11-18 16:13:01 +0000
+++ ubuntuone/syncdaemon/dbus_interface.py 2009-12-09 15:01:13 +0000
@@ -16,14 +16,20 @@
16# You should have received a copy of the GNU General Public License along16# You should have received a copy of the GNU General Public License along
17# with this program. If not, see <http://www.gnu.org/licenses/>.17# with this program. If not, see <http://www.gnu.org/licenses/>.
18""" DBUS interface module """18""" DBUS interface module """
19
20import dbus.service
21import logging
22
23from dbus import DBusException
19from itertools import groupby, chain24from itertools import groupby, chain
2025
21import dbus.service26from twisted.internet import defer
27from twisted.python.failure import Failure
2228
23from ubuntuone.syncdaemon.event_queue import EVENTS29from ubuntuone.syncdaemon.event_queue import EVENTS
24from ubuntuone.syncdaemon.interfaces import IMarker30from ubuntuone.syncdaemon.interfaces import IMarker
25from ubuntuone.syncdaemon.config import get_user_config31from ubuntuone.syncdaemon.config import get_user_config
26import logging32
2733
28# Disable the "Invalid Name" check here, as we have lots of DBus style names34# Disable the "Invalid Name" check here, as we have lots of DBus style names
29# pylint: disable-msg=C010335# pylint: disable-msg=C0103
@@ -46,6 +52,9 @@
46NM_STATE_EVENTS = {NM_STATE_CONNECTED: 'SYS_NET_CONNECTED',52NM_STATE_EVENTS = {NM_STATE_CONNECTED: 'SYS_NET_CONNECTED',
47 NM_STATE_DISCONNECTED: 'SYS_NET_DISCONNECTED'}53 NM_STATE_DISCONNECTED: 'SYS_NET_DISCONNECTED'}
4854
55# OAuthDesktop constants
56DBUS_IFACE_AUTH_NAME = "com.ubuntuone.Authentication"
57DBUS_PATH_AUTH = "/"
4958
50logger = logging.getLogger("ubuntuone.SyncDaemon.DBus")59logger = logging.getLogger("ubuntuone.SyncDaemon.DBus")
5160
@@ -1065,14 +1074,64 @@
1065 if event is not None:1074 if event is not None:
1066 self.event_queue.push(event)1075 self.event_queue.push(event)
10671076
1068 def connect(self):1077 @defer.inlineCallbacks
1069 """ Push the SYS_CONNECT event with the tokens in the keyring. """1078 def connect(self, do_login=True):
1079 """Push the SYS_CONNECT event with the token in the keyring or
1080 request the token via oauthdesktop and push the acquired token."""
1070 from ubuntuone.syncdaemon.main import NoAccessToken1081 from ubuntuone.syncdaemon.main import NoAccessToken
1071 try:1082 try:
1072 access_token = self.main.get_access_token()1083 access_token = self.main.get_access_token()
1073 self.event_queue.push('SYS_CONNECT', access_token)1084 self.event_queue.push('SYS_CONNECT', access_token)
1074 except NoAccessToken, e:1085 except NoAccessToken, e:
1075 logger.exception("Can't get the auth token")1086 if do_login:
1087 yield self._request_token()
1088 self.connect(do_login=False)
1089 else:
1090 logger.exception("Can't get the auth token")
1091
1092 def _request_token(self):
1093 """Request to OAuthDesktop to fetch the token"""
1094 from ubuntuone.syncdaemon.main import NoAccessToken
1095 d = defer.Deferred()
1096 def error_handler(error):
1097 """default dbus error handler"""
1098 if not d.called:
1099 d.errback(Failure(error))
1100
1101 def signal_handler(*args, **kwargs):
1102 """Signal handler"""
1103 member = kwargs.get('member', None)
1104 if member in ('NoCredentials', 'AuthorizationDenied',
1105 'OAuthError'):
1106 if not args:
1107 d.errback(Failure(NoAccessToken(member)))
1108 else:
1109 d.errback(Failure(NoAccessToken("%s: %s" %
1110 (member, args[0]))))
1111 elif member == 'NewCredentials' and not d.called:
1112 d.callback(args)
1113 # register signal handlers for each kind of error
1114 match = self.bus.add_signal_receiver(signal_handler,
1115 member_keyword='member',
1116 dbus_interface=DBUS_IFACE_AUTH_NAME)
1117 # call oauthdesktop
1118 try:
1119 client = self.bus.get_object(DBUS_IFACE_AUTH_NAME, DBUS_PATH_AUTH,
1120 follow_name_owner_changes=True)
1121 iface = dbus.Interface(client, DBUS_IFACE_AUTH_NAME)
1122 iface.login(self.main.realm, self.main.oauth_client.consumer.key,
1123 # ignore the reply, we get the result via signals
1124 reply_handler=lambda: None,
1125 error_handler=error_handler)
1126 except DBusException, e:
1127 d.errback(Failure(e))
1128 def remove_signal_receiver(r):
1129 # cleanup the signal receivers
1130 self.bus.remove_signal_receiver(match,
1131 dbus_interface=DBUS_IFACE_AUTH_NAME)
1132 return r
1133 d.addBoth(remove_signal_receiver)
1134 return d
10761135
1077 def disconnect(self):1136 def disconnect(self):
1078 """ Push the SYS_DISCONNECT event. """1137 """ Push the SYS_DISCONNECT event. """

Subscribers

People subscribed via source and target branches